testsuite/reftests: Update UI files

Run the UI files through `gtk-builder-tool simplify --3to4` to update
the layout properties.

diff --git a/testsuite/reftests/721800-0px-dotted-border.ref.ui b/testsuite/reftests/721800-0px-dotted-border.ref.ui
index bcf41a55e8796a0f3537bc97576935bf76b588b2..56115658feb038839371353407f39859bc504ba8 100644 (file)
--- a/testsuite/reftests/721800-0px-dotted-border.ref.ui
+++ b/testsuite/reftests/721800-0px-dotted-border.ref.ui
@@ -1,14 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!-- Generated with glade 3.16.0 on Tue Jan 14 03:12:07 2014 -->
 <interface>
-  <!-- interface-requires gtk+ 3.10 -->
   <object class="GtkWindow" id="window1">
-    <property name="can_focus">False</property>
     <property name="type">popup</property>
     <child>
       <object class="GtkLabel" id="label1">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
         <property name="label" translatable="yes">Hello World</property>
       </object>
     </child>

diff --git a/testsuite/reftests/721800-0px-dotted-border.ui b/testsuite/reftests/721800-0px-dotted-border.ui
index 3165aa4caf9b1e805b7fac659e691453d66a1421..0da0e9de660de29cbc87e4ba3824a08c196b4ad3 100644 (file)
--- a/testsuite/reftests/721800-0px-dotted-border.ui
+++ b/testsuite/reftests/721800-0px-dotted-border.ui
@@ -1,14 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!-- Generated with glade 3.16.0 on Tue Jan 14 03:14:21 2014 -->
 <interface>
-  <!-- interface-requires gtk+ 3.10 -->
   <object class="GtkWindow" id="window1">
-    <property name="can_focus">False</property>
     <property name="type">popup</property>
     <child>
       <object class="GtkLabel" id="label1">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
         <property name="label" translatable="yes">Hello World</property>
         <style>
           <class name="broken"/>

diff --git a/testsuite/reftests/actionbar.ref.ui b/testsuite/reftests/actionbar.ref.ui
index 29297984ea940c3660fce5cc044e7ee4d621f956..f92771d94909e87f8571405fb2b8ec451b84696b 100644 (file)
--- a/testsuite/reftests/actionbar.ref.ui
+++ b/testsuite/reftests/actionbar.ref.ui
@@ -1,25 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
 <interface>
   <object class="GtkWindow" id="window1">
     <property name="type">popup</property>
     <child>
       <object class="GtkBox">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
         <child>
           <object class="GtkBox">
             <child>
               <object class="GtkButton">
-                <property name="visible">True</property>
                 <property name="label">1</property>
-              </object>         
+              </object>
             </child>
             <child>
               <object class="GtkButton">
-                <property name="visible">True</property>
                 <property name="label">2</property>
-              </object>         
+              </object>
             </child>
-          </object>         
+          </object>
         </child>
         <child>
           <object class="GtkButton">
@@ -30,17 +27,15 @@
           <object class="GtkBox">
             <child>
               <object class="GtkButton">
-                <property name="visible">True</property>
                 <property name="label">2</property>
-              </object>         
+              </object>
             </child>
             <child>
               <object class="GtkButton">
-                <property name="visible">True</property>
                 <property name="label">1</property>
-              </object>         
+              </object>
             </child>
-          </object>         
+          </object>
         </child>
       </object>
     </child>

diff --git a/testsuite/reftests/actionbar.ui b/testsuite/reftests/actionbar.ui
index 2071b50020e126ae2508c49f19c089d011ae41f5..064d90e1437d24f12d504e8ae86b0b693287e58c 100644 (file)
--- a/testsuite/reftests/actionbar.ui
+++ b/testsuite/reftests/actionbar.ui
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
 <interface>
   <object class="GtkWindow" id="window1">
     <property name="type">popup</property>
@@ -7,13 +8,11 @@
           <object class="GtkButton">
             <property name="label">1</property>
           </object>
-          <packing/>
         </child>
         <child type="start">
           <object class="GtkButton">
             <property name="label">2</property>
           </object>
-          <packing/>
         </child>
         <child type="center">
           <object class="GtkButton">
@@ -24,13 +23,11 @@
           <object class="GtkButton">
             <property name="label">1</property>
           </object>
-          <packing/>
         </child>
         <child type="end">
           <object class="GtkButton">
             <property name="label">2</property>
           </object>
-          <packing/>
         </child>
       </object>
     </child>

diff --git a/testsuite/reftests/animation-direction.ref.ui b/testsuite/reftests/animation-direction.ref.ui
index c43ed1c11a5dc8cebec112107bdcbf556367b654..abcd7d641e5fc2dce0bbe5f3122d53201be86c78 100644 (file)
--- a/testsuite/reftests/animation-direction.ref.ui
+++ b/testsuite/reftests/animation-direction.ref.ui
@@ -1,494 +1,426 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!-- Generated with glade 3.18.1 -->
 <interface>
   <requires lib="gtk+" version="3.12"/>
   <object class="GtkWindow" id="window1">
-    <property name="can_focus">False</property>
     <property name="type">popup</property>
     <child>
       <object class="GtkGrid" id="grid1">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
         <property name="column_spacing">2</property>
         <child>
           <object class="GtkLabel" id="label1">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="label" translatable="yes">XXX</property>
             <signal name="map" handler="reftest:strip_attributes_if_no_animation"/>
             <attributes>
-              <attribute name="foreground" value="#ffff00000000"/>
+              <attribute name="foreground" value="#ffff00000000"></attribute>
             </attributes>
+            <layout>
+              <property name="left_attach">0</property>
+              <property name="top_attach">0</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">0</property>
-            <property name="top_attach">0</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="label32">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="label" translatable="yes">XXX</property>
             <signal name="map" handler="reftest:strip_attributes_if_no_animation"/>
             <attributes>
-              <attribute name="foreground" value="#ffffffff0000"/>
+              <attribute name="foreground" value="#ffffffff0000"></attribute>
             </attributes>
+            <layout>
+              <property name="left_attach">1</property>
+              <property name="top_attach">0</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">1</property>
-            <property name="top_attach">0</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="label2">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="label" translatable="yes">XXX</property>
             <signal name="map" handler="reftest:strip_attributes_if_no_animation"/>
             <attributes>
-              <attribute name="foreground" value="#ffff00000000"/>
+              <attribute name="foreground" value="#ffff00000000"></attribute>
             </attributes>
+            <layout>
+              <property name="left_attach">2</property>
+              <property name="top_attach">0</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">2</property>
-            <property name="top_attach">0</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="label3">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="label" translatable="yes">XXX</property>
             <signal name="map" handler="reftest:strip_attributes_if_no_animation"/>
             <attributes>
-              <attribute name="foreground" value="#ffff00000000"/>
+              <attribute name="foreground" value="#ffff00000000"></attribute>
             </attributes>
+            <layout>
+              <property name="left_attach">4</property>
+              <property name="top_attach">0</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">4</property>
-            <property name="top_attach">0</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="label4">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="label" translatable="yes">XXX</property>
             <signal name="map" handler="reftest:strip_attributes_if_no_animation"/>
             <attributes>
-              <attribute name="foreground" value="#ffff00000000"/>
+              <attribute name="foreground" value="#ffff00000000"></attribute>
             </attributes>
+            <layout>
+              <property name="left_attach">6</property>
+              <property name="top_attach">0</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">6</property>
-            <property name="top_attach">0</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="label5">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="label" translatable="yes">XXX</property>
             <signal name="map" handler="reftest:strip_attributes_if_no_animation"/>
             <attributes>
-              <attribute name="foreground" value="#ffff00000000"/>
+              <attribute name="foreground" value="#ffff00000000"></attribute>
             </attributes>
+            <layout>
+              <property name="left_attach">1</property>
+              <property name="top_attach">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">1</property>
-            <property name="top_attach">1</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="label6">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="label" translatable="yes">XXX</property>
             <signal name="map" handler="reftest:strip_attributes_if_no_animation"/>
             <attributes>
-              <attribute name="foreground" value="#ffff00000000"/>
+              <attribute name="foreground" value="#ffff00000000"></attribute>
             </attributes>
+            <layout>
+              <property name="left_attach">3</property>
+              <property name="top_attach">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">3</property>
-            <property name="top_attach">1</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="label7">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="label" translatable="yes">XXX</property>
             <signal name="map" handler="reftest:strip_attributes_if_no_animation"/>
             <attributes>
-              <attribute name="foreground" value="#ffff00000000"/>
+              <attribute name="foreground" value="#ffff00000000"></attribute>
             </attributes>
+            <layout>
+              <property name="left_attach">5</property>
+              <property name="top_attach">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">5</property>
-            <property name="top_attach">1</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="label8">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="label" translatable="yes">XXX</property>
             <signal name="map" handler="reftest:strip_attributes_if_no_animation"/>
             <attributes>
-              <attribute name="foreground" value="#ffff00000000"/>
+              <attribute name="foreground" value="#ffff00000000"></attribute>
             </attributes>
+            <layout>
+              <property name="left_attach">7</property>
+              <property name="top_attach">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">7</property>
-            <property name="top_attach">1</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="label9">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="label" translatable="yes">XXX</property>
             <signal name="map" handler="reftest:strip_attributes_if_no_animation"/>
             <attributes>
-              <attribute name="foreground" value="#ffff00000000"/>
+              <attribute name="foreground" value="#ffff00000000"></attribute>
             </attributes>
+            <layout>
+              <property name="left_attach">0</property>
+              <property name="top_attach">2</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">0</property>
-            <property name="top_attach">2</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="label10">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="label" translatable="yes">XXX</property>
             <signal name="map" handler="reftest:strip_attributes_if_no_animation"/>
             <attributes>
-              <attribute name="foreground" value="#ffff00000000"/>
+              <attribute name="foreground" value="#ffff00000000"></attribute>
             </attributes>
+            <layout>
+              <property name="left_attach">3</property>
+              <property name="top_attach">2</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">3</property>
-            <property name="top_attach">2</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="label11">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="label" translatable="yes">XXX</property>
             <signal name="map" handler="reftest:strip_attributes_if_no_animation"/>
             <attributes>
-              <attribute name="foreground" value="#ffff00000000"/>
+              <attribute name="foreground" value="#ffff00000000"></attribute>
             </attributes>
+            <layout>
+              <property name="left_attach">4</property>
+              <property name="top_attach">2</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">4</property>
-            <property name="top_attach">2</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="label12">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="label" translatable="yes">XXX</property>
             <signal name="map" handler="reftest:strip_attributes_if_no_animation"/>
             <attributes>
-              <attribute name="foreground" value="#ffff00000000"/>
+              <attribute name="foreground" value="#ffff00000000"></attribute>
             </attributes>
+            <layout>
+              <property name="left_attach">7</property>
+              <property name="top_attach">2</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">7</property>
-            <property name="top_attach">2</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="label13">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="label" translatable="yes">XXX</property>
             <signal name="map" handler="reftest:strip_attributes_if_no_animation"/>
             <attributes>
-              <attribute name="foreground" value="#ffff00000000"/>
+              <attribute name="foreground" value="#ffff00000000"></attribute>
             </attributes>
+            <layout>
+              <property name="left_attach">1</property>
+              <property name="top_attach">3</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">1</property>
-            <property name="top_attach">3</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="label14">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="label" translatable="yes">XXX</property>
             <signal name="map" handler="reftest:strip_attributes_if_no_animation"/>
             <attributes>
-              <attribute name="foreground" value="#ffff00000000"/>
+              <attribute name="foreground" value="#ffff00000000"></attribute>
             </attributes>
+            <layout>
+              <property name="left_attach">2</property>
+              <property name="top_attach">3</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">2</property>
-            <property name="top_attach">3</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="label15">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="label" translatable="yes">XXX</property>
             <signal name="map" handler="reftest:strip_attributes_if_no_animation"/>
             <attributes>
-              <attribute name="foreground" value="#ffff00000000"/>
+              <attribute name="foreground" value="#ffff00000000"></attribute>
             </attributes>
+            <layout>
+              <property name="left_attach">5</property>
+              <property name="top_attach">3</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">5</property>
-            <property name="top_attach">3</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="label16">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="label" translatable="yes">XXX</property>
             <signal name="map" handler="reftest:strip_attributes_if_no_animation"/>
             <attributes>
-              <attribute name="foreground" value="#ffff00000000"/>
+              <attribute name="foreground" value="#ffff00000000"></attribute>
             </attributes>
+            <layout>
+              <property name="left_attach">6</property>
+              <property name="top_attach">3</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">6</property>
-            <property name="top_attach">3</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="label17">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="label" translatable="yes">XXX</property>
             <signal name="map" handler="reftest:strip_attributes_if_no_animation"/>
             <attributes>
-              <attribute name="foreground" value="#ffffffff0000"/>
+              <attribute name="foreground" value="#ffffffff0000"></attribute>
             </attributes>
+            <layout>
+              <property name="left_attach">3</property>
+              <property name="top_attach">0</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">3</property>
-            <property name="top_attach">0</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="label18">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="label" translatable="yes">XXX</property>
             <signal name="map" handler="reftest:strip_attributes_if_no_animation"/>
             <attributes>
-              <attribute name="foreground" value="#ffffffff0000"/>
+              <attribute name="foreground" value="#ffffffff0000"></attribute>
             </attributes>
+            <layout>
+              <property name="left_attach">0</property>
+              <property name="top_attach">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">0</property>
-            <property name="top_attach">1</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="label19">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="label" translatable="yes">XXX</property>
             <signal name="map" handler="reftest:strip_attributes_if_no_animation"/>
             <attributes>
-              <attribute name="foreground" value="#ffffffff0000"/>
+              <attribute name="foreground" value="#ffffffff0000"></attribute>
             </attributes>
+            <layout>
+              <property name="left_attach">5</property>
+              <property name="top_attach">0</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">5</property>
-            <property name="top_attach">0</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="label20">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="label" translatable="yes">XXX</property>
             <signal name="map" handler="reftest:strip_attributes_if_no_animation"/>
             <attributes>
-              <attribute name="foreground" value="#ffffffff0000"/>
+              <attribute name="foreground" value="#ffffffff0000"></attribute>
             </attributes>
+            <layout>
+              <property name="left_attach">6</property>
+              <property name="top_attach">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">6</property>
-            <property name="top_attach">1</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="label21">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="label" translatable="yes">XXX</property>
             <signal name="map" handler="reftest:strip_attributes_if_no_animation"/>
             <attributes>
-              <attribute name="foreground" value="#ffffffff0000"/>
+              <attribute name="foreground" value="#ffffffff0000"></attribute>
             </attributes>
+            <layout>
+              <property name="left_attach">7</property>
+              <property name="top_attach">0</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">7</property>
-            <property name="top_attach">0</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="label22">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="label" translatable="yes">XXX</property>
             <signal name="map" handler="reftest:strip_attributes_if_no_animation"/>
             <attributes>
-              <attribute name="foreground" value="#ffffffff0000"/>
+              <attribute name="foreground" value="#ffffffff0000"></attribute>
             </attributes>
+            <layout>
+              <property name="left_attach">6</property>
+              <property name="top_attach">2</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">6</property>
-            <property name="top_attach">2</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="label23">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="label" translatable="yes">XXX</property>
             <signal name="map" handler="reftest:strip_attributes_if_no_animation"/>
             <attributes>
-              <attribute name="foreground" value="#ffffffff0000"/>
+              <attribute name="foreground" value="#ffffffff0000"></attribute>
             </attributes>
+            <layout>
+              <property name="left_attach">4</property>
+              <property name="top_attach">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">4</property>
-            <property name="top_attach">1</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="label24">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="label" translatable="yes">XXX</property>
             <signal name="map" handler="reftest:strip_attributes_if_no_animation"/>
             <attributes>
-              <attribute name="foreground" value="#ffffffff0000"/>
+              <attribute name="foreground" value="#ffffffff0000"></attribute>
             </attributes>
+            <layout>
+              <property name="left_attach">2</property>
+              <property name="top_attach">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">2</property>
-            <property name="top_attach">1</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="label25">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="label" translatable="yes">XXX</property>
             <signal name="map" handler="reftest:strip_attributes_if_no_animation"/>
             <attributes>
-              <attribute name="foreground" value="#ffffffff0000"/>
+              <attribute name="foreground" value="#ffffffff0000"></attribute>
             </attributes>
+            <layout>
+              <property name="left_attach">1</property>
+              <property name="top_attach">2</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">1</property>
-            <property name="top_attach">2</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="label26">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="label" translatable="yes">XXX</property>
             <signal name="map" handler="reftest:strip_attributes_if_no_animation"/>
             <attributes>
-              <attribute name="foreground" value="#ffffffff0000"/>
+              <attribute name="foreground" value="#ffffffff0000"></attribute>
             </attributes>
+            <layout>
+              <property name="left_attach">0</property>
+              <property name="top_attach">3</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">0</property>
-            <property name="top_attach">3</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="label27">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="label" translatable="yes">XXX</property>
             <signal name="map" handler="reftest:strip_attributes_if_no_animation"/>
             <attributes>
-              <attribute name="foreground" value="#ffffffff0000"/>
+              <attribute name="foreground" value="#ffffffff0000"></attribute>
             </attributes>
+            <layout>
+              <property name="left_attach">2</property>
+              <property name="top_attach">2</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">2</property>
-            <property name="top_attach">2</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="label28">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="label" translatable="yes">XXX</property>
             <signal name="map" handler="reftest:strip_attributes_if_no_animation"/>
             <attributes>
-              <attribute name="foreground" value="#ffffffff0000"/>
+              <attribute name="foreground" value="#ffffffff0000"></attribute>
             </attributes>
+            <layout>
+              <property name="left_attach">3</property>
+              <property name="top_attach">3</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">3</property>
-            <property name="top_attach">3</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="label29">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="label" translatable="yes">XXX</property>
             <signal name="map" handler="reftest:strip_attributes_if_no_animation"/>
             <attributes>
-              <attribute name="foreground" value="#ffffffff0000"/>
+              <attribute name="foreground" value="#ffffffff0000"></attribute>
             </attributes>
+            <layout>
+              <property name="left_attach">4</property>
+              <property name="top_attach">3</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">4</property>
-            <property name="top_attach">3</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="label30">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="label" translatable="yes">XXX</property>
             <signal name="map" handler="reftest:strip_attributes_if_no_animation"/>
             <attributes>
-              <attribute name="foreground" value="#ffffffff0000"/>
+              <attribute name="foreground" value="#ffffffff0000"></attribute>
             </attributes>
+            <layout>
+              <property name="left_attach">5</property>
+              <property name="top_attach">2</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">5</property>
-            <property name="top_attach">2</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="label31">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="label" translatable="yes">XXX</property>
             <signal name="map" handler="reftest:strip_attributes_if_no_animation"/>
             <attributes>
-              <attribute name="foreground" value="#ffffffff0000"/>
+              <attribute name="foreground" value="#ffffffff0000"></attribute>
             </attributes>
+            <layout>
+              <property name="left_attach">7</property>
+              <property name="top_attach">3</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">7</property>
-            <property name="top_attach">3</property>
-          </packing>
         </child>
       </object>
     </child>

diff --git a/testsuite/reftests/animation-direction.ui b/testsuite/reftests/animation-direction.ui
index 887dd1dc866a00cb999fede66e8dd1807e65dd8c..3cc66722873043cd568d5244ecbef5b819b2f615 100644 (file)
--- a/testsuite/reftests/animation-direction.ui
+++ b/testsuite/reftests/animation-direction.ui
@@ -1,494 +1,426 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!-- Generated with glade 3.18.1 -->
 <interface>
   <requires lib="gtk+" version="3.12"/>
   <object class="GtkWindow" id="window1">
-    <property name="can_focus">False</property>
     <property name="type">popup</property>
     <child>
       <object class="GtkGrid" id="grid1">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
         <property name="column_spacing">2</property>
         <child>
           <object class="GtkLabel" id="label1">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="label" translatable="yes">XXX</property>
             <style>
               <class name="direction-normal"/>
               <class name="delay-5s"/>
             </style>
+            <layout>
+              <property name="left_attach">0</property>
+              <property name="top_attach">0</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">0</property>
-            <property name="top_attach">0</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="label2">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="label" translatable="yes">XXX</property>
             <style>
               <class name="direction-reverse"/>
               <class name="delay-5s"/>
             </style>
+            <layout>
+              <property name="left_attach">0</property>
+              <property name="top_attach">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">0</property>
-            <property name="top_attach">1</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="label3">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="label" translatable="yes">XXX</property>
             <style>
               <class name="direction-alternate"/>
               <class name="delay-5s"/>
             </style>
+            <layout>
+              <property name="left_attach">0</property>
+              <property name="top_attach">2</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">0</property>
-            <property name="top_attach">2</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="label4">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="label" translatable="yes">XXX</property>
             <style>
               <class name="direction-alternate-reverse"/>
               <class name="delay-5s"/>
             </style>
+            <layout>
+              <property name="left_attach">0</property>
+              <property name="top_attach">3</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">0</property>
-            <property name="top_attach">3</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="label5">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="label" translatable="yes">XXX</property>
             <style>
               <class name="direction-alternate-reverse"/>
               <class name="delay-15s"/>
             </style>
+            <layout>
+              <property name="left_attach">1</property>
+              <property name="top_attach">3</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">1</property>
-            <property name="top_attach">3</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="label6">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="label" translatable="yes">XXX</property>
             <style>
               <class name="direction-alternate-reverse"/>
               <class name="delay-25s"/>
             </style>
+            <layout>
+              <property name="left_attach">2</property>
+              <property name="top_attach">3</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">2</property>
-            <property name="top_attach">3</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="label7">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="label" translatable="yes">XXX</property>
             <style>
               <class name="direction-alternate-reverse"/>
               <class name="delay-35s"/>
             </style>
+            <layout>
+              <property name="left_attach">3</property>
+              <property name="top_attach">3</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">3</property>
-            <property name="top_attach">3</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="label8">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="label" translatable="yes">XXX</property>
             <style>
               <class name="direction-alternate-reverse"/>
               <class name="delay-45s"/>
             </style>
+            <layout>
+              <property name="left_attach">4</property>
+              <property name="top_attach">3</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">4</property>
-            <property name="top_attach">3</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="label9">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="label" translatable="yes">XXX</property>
             <style>
               <class name="direction-alternate-reverse"/>
               <class name="delay-55s"/>
             </style>
+            <layout>
+              <property name="left_attach">5</property>
+              <property name="top_attach">3</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">5</property>
-            <property name="top_attach">3</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="label10">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="label" translatable="yes">XXX</property>
             <style>
               <class name="direction-alternate-reverse"/>
               <class name="delay-65s"/>
             </style>
+            <layout>
+              <property name="left_attach">6</property>
+              <property name="top_attach">3</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">6</property>
-            <property name="top_attach">3</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="label11">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="label" translatable="yes">XXX</property>
             <style>
               <class name="direction-alternate-reverse"/>
               <class name="delay-75s"/>
             </style>
+            <layout>
+              <property name="left_attach">7</property>
+              <property name="top_attach">3</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">7</property>
-            <property name="top_attach">3</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="label14">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="label" translatable="yes">XXX</property>
             <style>
               <class name="direction-alternate"/>
               <class name="delay-15s"/>
             </style>
+            <layout>
+              <property name="left_attach">1</property>
+              <property name="top_attach">2</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">1</property>
-            <property name="top_attach">2</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="label15">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="label" translatable="yes">XXX</property>
             <style>
               <class name="direction-alternate"/>
               <class name="delay-25s"/>
             </style>
+            <layout>
+              <property name="left_attach">2</property>
+              <property name="top_attach">2</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">2</property>
-            <property name="top_attach">2</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="label16">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="label" translatable="yes">XXX</property>
             <style>
               <class name="direction-alternate"/>
               <class name="delay-35s"/>
             </style>
+            <layout>
+              <property name="left_attach">3</property>
+              <property name="top_attach">2</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">3</property>
-            <property name="top_attach">2</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="label17">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="label" translatable="yes">XXX</property>
             <style>
               <class name="direction-alternate"/>
               <class name="delay-45s"/>
             </style>
+            <layout>
+              <property name="left_attach">4</property>
+              <property name="top_attach">2</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">4</property>
-            <property name="top_attach">2</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="label18">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="label" translatable="yes">XXX</property>
             <style>
               <class name="direction-alternate"/>
               <class name="delay-55s"/>
             </style>
+            <layout>
+              <property name="left_attach">5</property>
+              <property name="top_attach">2</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">5</property>
-            <property name="top_attach">2</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="label19">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="label" translatable="yes">XXX</property>
             <style>
               <class name="direction-alternate"/>
               <class name="delay-65s"/>
             </style>
+            <layout>
+              <property name="left_attach">6</property>
+              <property name="top_attach">2</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">6</property>
-            <property name="top_attach">2</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="label20">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="label" translatable="yes">XXX</property>
             <style>
               <class name="direction-alternate"/>
               <class name="delay-75s"/>
             </style>
+            <layout>
+              <property name="left_attach">7</property>
+              <property name="top_attach">2</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">7</property>
-            <property name="top_attach">2</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="label23">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="label" translatable="yes">XXX</property>
             <style>
               <class name="direction-reverse"/>
               <class name="delay-15s"/>
             </style>
+            <layout>
+              <property name="left_attach">1</property>
+              <property name="top_attach">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">1</property>
-            <property name="top_attach">1</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="label24">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="label" translatable="yes">XXX</property>
             <style>
               <class name="direction-reverse"/>
               <class name="delay-25s"/>
             </style>
+            <layout>
+              <property name="left_attach">2</property>
+              <property name="top_attach">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">2</property>
-            <property name="top_attach">1</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="label25">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="label" translatable="yes">XXX</property>
             <style>
               <class name="direction-reverse"/>
               <class name="delay-35s"/>
             </style>
+            <layout>
+              <property name="left_attach">3</property>
+              <property name="top_attach">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">3</property>
-            <property name="top_attach">1</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="label26">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="label" translatable="yes">XXX</property>
             <style>
               <class name="direction-reverse"/>
               <class name="delay-45s"/>
             </style>
+            <layout>
+              <property name="left_attach">4</property>
+              <property name="top_attach">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">4</property>
-            <property name="top_attach">1</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="label27">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="label" translatable="yes">XXX</property>
             <style>
               <class name="direction-reverse"/>
               <class name="delay-55s"/>
             </style>
+            <layout>
+              <property name="left_attach">5</property>
+              <property name="top_attach">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">5</property>
-            <property name="top_attach">1</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="label28">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="label" translatable="yes">XXX</property>
             <style>
               <class name="direction-reverse"/>
               <class name="delay-65s"/>
             </style>
+            <layout>
+              <property name="left_attach">6</property>
+              <property name="top_attach">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">6</property>
-            <property name="top_attach">1</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="label29">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="label" translatable="yes">XXX</property>
             <style>
               <class name="direction-reverse"/>
               <class name="delay-75s"/>
             </style>
+            <layout>
+              <property name="left_attach">7</property>
+              <property name="top_attach">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">7</property>
-            <property name="top_attach">1</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="label32">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="label" translatable="yes">XXX</property>
             <style>
               <class name="direction-normal"/>
               <class name="delay-15s"/>
             </style>
+            <layout>
+              <property name="left_attach">1</property>
+              <property name="top_attach">0</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">1</property>
-            <property name="top_attach">0</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="label33">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="label" translatable="yes">XXX</property>
             <style>
               <class name="direction-normal"/>
               <class name="delay-25s"/>
             </style>
+            <layout>
+              <property name="left_attach">2</property>
+              <property name="top_attach">0</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">2</property>
-            <property name="top_attach">0</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="label34">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="label" translatable="yes">XXX</property>
             <style>
               <class name="direction-normal"/>
               <class name="delay-35s"/>
             </style>
+            <layout>
+              <property name="left_attach">3</property>
+              <property name="top_attach">0</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">3</property>
-            <property name="top_attach">0</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="label35">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="label" translatable="yes">XXX</property>
             <style>
               <class name="direction-normal"/>
               <class name="delay-45s"/>
             </style>
+            <layout>
+              <property name="left_attach">4</property>
+              <property name="top_attach">0</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">4</property>
-            <property name="top_attach">0</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="label36">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="label" translatable="yes">XXX</property>
             <style>
               <class name="direction-normal"/>
               <class name="delay-55s"/>
             </style>
+            <layout>
+              <property name="left_attach">5</property>
+              <property name="top_attach">0</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">5</property>
-            <property name="top_attach">0</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="label37">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="label" translatable="yes">XXX</property>
             <style>
               <class name="direction-normal"/>
               <class name="delay-65s"/>
             </style>
+            <layout>
+              <property name="left_attach">6</property>
+              <property name="top_attach">0</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">6</property>
-            <property name="top_attach">0</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="label38">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="label" translatable="yes">XXX</property>
             <style>
               <class name="direction-normal"/>
               <class name="delay-75s"/>
             </style>
+            <layout>
+              <property name="left_attach">7</property>
+              <property name="top_attach">0</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">7</property>
-            <property name="top_attach">0</property>
-          </packing>
         </child>
       </object>
     </child>

diff --git a/testsuite/reftests/animation-fill-mode-iteration-count.ref.ui b/testsuite/reftests/animation-fill-mode-iteration-count.ref.ui
index 914e4e8cbc19016bb06a83cb0cbc4b5e9cf5f5c3..abc051f8836f16458781f584703c89d653384657 100644 (file)
--- a/testsuite/reftests/animation-fill-mode-iteration-count.ref.ui
+++ b/testsuite/reftests/animation-fill-mode-iteration-count.ref.ui
@@ -1,75 +1,59 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!-- Generated with glade 3.19.0 -->
 <interface>
   <requires lib="gtk+" version="3.16"/>
   <object class="GtkWindow" id="window1">
-    <property name="can_focus">False</property>
     <child>
       <object class="GtkGrid" id="grid1">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
         <child>
           <object class="GtkLabel" id="label1">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="label" translatable="yes">normal</property>
+            <layout>
+              <property name="left_attach">0</property>
+              <property name="top_attach">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">0</property>
-            <property name="top_attach">1</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="label2">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="label" translatable="yes">reverse</property>
+            <layout>
+              <property name="left_attach">0</property>
+              <property name="top_attach">2</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">0</property>
-            <property name="top_attach">2</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="label3">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="label" translatable="yes">alternate</property>
+            <layout>
+              <property name="left_attach">0</property>
+              <property name="top_attach">3</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">0</property>
-            <property name="top_attach">3</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="label4">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="label" translatable="yes">alternate-reverse</property>
+            <layout>
+              <property name="left_attach">0</property>
+              <property name="top_attach">4</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">0</property>
-            <property name="top_attach">4</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="label12">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="label" translatable="yes">--&gt;
 2⅕x</property>
+            <layout>
+              <property name="left_attach">12</property>
+              <property name="top_attach">0</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">12</property>
-            <property name="top_attach">0</property>
-          </packing>
         </child>
         <child>
           <object class="GtkBox" id="box31">
             <property name="width_request">50</property>
             <property name="height_request">50</property>
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="orientation">vertical</property>
             <child>
               <placeholder/>
@@ -77,18 +61,16 @@
             <style>
               <class name="lightorange"/>
             </style>
+            <layout>
+              <property name="left_attach">12</property>
+              <property name="top_attach">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">12</property>
-            <property name="top_attach">1</property>
-          </packing>
         </child>
         <child>
           <object class="GtkBox" id="box32">
             <property name="width_request">50</property>
             <property name="height_request">50</property>
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="orientation">vertical</property>
             <child>
               <placeholder/>
@@ -96,18 +78,16 @@
             <style>
               <class name="darkorange"/>
             </style>
+            <layout>
+              <property name="left_attach">12</property>
+              <property name="top_attach">2</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">12</property>
-            <property name="top_attach">2</property>
-          </packing>
         </child>
         <child>
           <object class="GtkBox" id="box30">
             <property name="width_request">50</property>
             <property name="height_request">50</property>
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="orientation">vertical</property>
             <child>
               <placeholder/>
@@ -115,18 +95,16 @@
             <style>
               <class name="lightorange"/>
             </style>
+            <layout>
+              <property name="left_attach">12</property>
+              <property name="top_attach">3</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">12</property>
-            <property name="top_attach">3</property>
-          </packing>
         </child>
         <child>
           <object class="GtkBox" id="box29">
             <property name="width_request">50</property>
             <property name="height_request">50</property>
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="orientation">vertical</property>
             <child>
               <placeholder/>
@@ -134,18 +112,16 @@
             <style>
               <class name="darkorange"/>
             </style>
+            <layout>
+              <property name="left_attach">12</property>
+              <property name="top_attach">4</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">12</property>
-            <property name="top_attach">4</property>
-          </packing>
         </child>
         <child>
           <object class="GtkBox" id="box28">
             <property name="width_request">50</property>
             <property name="height_request">50</property>
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="orientation">vertical</property>
             <child>
               <placeholder/>
@@ -153,18 +129,16 @@
             <style>
               <class name="red"/>
             </style>
+            <layout>
+              <property name="left_attach">11</property>
+              <property name="top_attach">4</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">11</property>
-            <property name="top_attach">4</property>
-          </packing>
         </child>
         <child>
           <object class="GtkBox" id="box27">
             <property name="width_request">50</property>
             <property name="height_request">50</property>
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="orientation">vertical</property>
             <child>
               <placeholder/>
@@ -172,18 +146,16 @@
             <style>
               <class name="yellow"/>
             </style>
+            <layout>
+              <property name="left_attach">11</property>
+              <property name="top_attach">3</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">11</property>
-            <property name="top_attach">3</property>
-          </packing>
         </child>
         <child>
           <object class="GtkBox" id="box26">
             <property name="width_request">50</property>
             <property name="height_request">50</property>
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="orientation">vertical</property>
             <child>
               <placeholder/>
@@ -191,18 +163,16 @@
             <style>
               <class name="red"/>
             </style>
+            <layout>
+              <property name="left_attach">11</property>
+              <property name="top_attach">2</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">11</property>
-            <property name="top_attach">2</property>
-          </packing>
         </child>
         <child>
           <object class="GtkBox" id="box18">
             <property name="width_request">50</property>
             <property name="height_request">50</property>
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="orientation">vertical</property>
             <child>
               <placeholder/>
@@ -210,42 +180,36 @@
             <style>
               <class name="yellow"/>
             </style>
+            <layout>
+              <property name="left_attach">11</property>
+              <property name="top_attach">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">11</property>
-            <property name="top_attach">1</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="label11">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="label" translatable="yes">&lt;--
 2⅕x</property>
+            <layout>
+              <property name="left_attach">11</property>
+              <property name="top_attach">0</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">11</property>
-            <property name="top_attach">0</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="label10">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="label" translatable="yes">--&gt;
 2x</property>
+            <layout>
+              <property name="left_attach">10</property>
+              <property name="top_attach">0</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">10</property>
-            <property name="top_attach">0</property>
-          </packing>
         </child>
         <child>
           <object class="GtkBox" id="box25">
             <property name="width_request">50</property>
             <property name="height_request">50</property>
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="orientation">vertical</property>
             <child>
               <placeholder/>
@@ -253,18 +217,16 @@
             <style>
               <class name="red"/>
             </style>
+            <layout>
+              <property name="left_attach">10</property>
+              <property name="top_attach">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">10</property>
-            <property name="top_attach">1</property>
-          </packing>
         </child>
         <child>
           <object class="GtkBox" id="box24">
             <property name="width_request">50</property>
             <property name="height_request">50</property>
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="orientation">vertical</property>
             <child>
               <placeholder/>
@@ -272,18 +234,16 @@
             <style>
               <class name="yellow"/>
             </style>
+            <layout>
+              <property name="left_attach">10</property>
+              <property name="top_attach">2</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">10</property>
-            <property name="top_attach">2</property>
-          </packing>
         </child>
         <child>
           <object class="GtkBox" id="box23">
             <property name="width_request">50</property>
             <property name="height_request">50</property>
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="orientation">vertical</property>
             <child>
               <placeholder/>
@@ -291,18 +251,16 @@
             <style>
               <class name="yellow"/>
             </style>
+            <layout>
+              <property name="left_attach">10</property>
+              <property name="top_attach">3</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">10</property>
-            <property name="top_attach">3</property>
-          </packing>
         </child>
         <child>
           <object class="GtkBox" id="box22">
             <property name="width_request">50</property>
             <property name="height_request">50</property>
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="orientation">vertical</property>
             <child>
               <placeholder/>
@@ -310,18 +268,16 @@
             <style>
               <class name="red"/>
             </style>
+            <layout>
+              <property name="left_attach">10</property>
+              <property name="top_attach">4</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">10</property>
-            <property name="top_attach">4</property>
-          </packing>
         </child>
         <child>
           <object class="GtkBox" id="box21">
             <property name="width_request">50</property>
             <property name="height_request">50</property>
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="orientation">vertical</property>
             <child>
               <placeholder/>
@@ -329,18 +285,16 @@
             <style>
               <class name="red"/>
             </style>
+            <layout>
+              <property name="left_attach">9</property>
+              <property name="top_attach">4</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">9</property>
-            <property name="top_attach">4</property>
-          </packing>
         </child>
         <child>
           <object class="GtkBox" id="box20">
             <property name="width_request">50</property>
             <property name="height_request">50</property>
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="orientation">vertical</property>
             <child>
               <placeholder/>
@@ -348,18 +302,16 @@
             <style>
               <class name="yellow"/>
             </style>
+            <layout>
+              <property name="left_attach">9</property>
+              <property name="top_attach">3</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">9</property>
-            <property name="top_attach">3</property>
-          </packing>
         </child>
         <child>
           <object class="GtkBox" id="box19">
             <property name="width_request">50</property>
             <property name="height_request">50</property>
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="orientation">vertical</property>
             <child>
               <placeholder/>
@@ -367,18 +319,16 @@
             <style>
               <class name="red"/>
             </style>
+            <layout>
+              <property name="left_attach">9</property>
+              <property name="top_attach">2</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">9</property>
-            <property name="top_attach">2</property>
-          </packing>
         </child>
         <child>
           <object class="GtkBox" id="box17">
             <property name="width_request">50</property>
             <property name="height_request">50</property>
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="orientation">vertical</property>
             <child>
               <placeholder/>
@@ -386,42 +336,36 @@
             <style>
               <class name="yellow"/>
             </style>
+            <layout>
+              <property name="left_attach">9</property>
+              <property name="top_attach">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">9</property>
-            <property name="top_attach">1</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="label9">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="label" translatable="yes">&lt;--
 2x</property>
+            <layout>
+              <property name="left_attach">9</property>
+              <property name="top_attach">0</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">9</property>
-            <property name="top_attach">0</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="label8">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="label" translatable="yes">--&gt;
 1⅕x</property>
+            <layout>
+              <property name="left_attach">8</property>
+              <property name="top_attach">0</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">8</property>
-            <property name="top_attach">0</property>
-          </packing>
         </child>
         <child>
           <object class="GtkBox" id="box10">
             <property name="width_request">50</property>
             <property name="height_request">50</property>
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="orientation">vertical</property>
             <child>
               <placeholder/>
@@ -429,18 +373,16 @@
             <style>
               <class name="lightorange"/>
             </style>
+            <layout>
+              <property name="left_attach">8</property>
+              <property name="top_attach">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">8</property>
-            <property name="top_attach">1</property>
-          </packing>
         </child>
         <child>
           <object class="GtkBox" id="box16">
             <property name="width_request">50</property>
             <property name="height_request">50</property>
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="orientation">vertical</property>
             <child>
               <placeholder/>
@@ -448,18 +390,16 @@
             <style>
               <class name="darkorange"/>
             </style>
+            <layout>
+              <property name="left_attach">8</property>
+              <property name="top_attach">2</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">8</property>
-            <property name="top_attach">2</property>
-          </packing>
         </child>
         <child>
           <object class="GtkBox" id="box15">
             <property name="width_request">50</property>
             <property name="height_request">50</property>
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="orientation">vertical</property>
             <child>
               <placeholder/>
@@ -467,18 +407,16 @@
             <style>
               <class name="darkorange"/>
             </style>
+            <layout>
+              <property name="left_attach">8</property>
+              <property name="top_attach">3</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">8</property>
-            <property name="top_attach">3</property>
-          </packing>
         </child>
         <child>
           <object class="GtkBox" id="box14">
             <property name="width_request">50</property>
             <property name="height_request">50</property>
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="orientation">vertical</property>
             <child>
               <placeholder/>
@@ -486,30 +424,26 @@
             <style>
               <class name="lightorange"/>
             </style>
+            <layout>
+              <property name="left_attach">8</property>
+              <property name="top_attach">4</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">8</property>
-            <property name="top_attach">4</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="label7">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="label" translatable="yes">&lt;--
 1⅕x</property>
+            <layout>
+              <property name="left_attach">7</property>
+              <property name="top_attach">0</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">7</property>
-            <property name="top_attach">0</property>
-          </packing>
         </child>
         <child>
           <object class="GtkBox" id="box9">
             <property name="width_request">50</property>
             <property name="height_request">50</property>
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="orientation">vertical</property>
             <child>
               <placeholder/>
@@ -517,18 +451,16 @@
             <style>
               <class name="yellow"/>
             </style>
+            <layout>
+              <property name="left_attach">7</property>
+              <property name="top_attach">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">7</property>
-            <property name="top_attach">1</property>
-          </packing>
         </child>
         <child>
           <object class="GtkBox" id="box11">
             <property name="width_request">50</property>
             <property name="height_request">50</property>
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="orientation">vertical</property>
             <child>
               <placeholder/>
@@ -536,18 +468,16 @@
             <style>
               <class name="red"/>
             </style>
+            <layout>
+              <property name="left_attach">7</property>
+              <property name="top_attach">2</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">7</property>
-            <property name="top_attach">2</property>
-          </packing>
         </child>
         <child>
           <object class="GtkBox" id="box12">
             <property name="width_request">50</property>
             <property name="height_request">50</property>
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="orientation">vertical</property>
             <child>
               <placeholder/>
@@ -555,18 +485,16 @@
             <style>
               <class name="yellow"/>
             </style>
+            <layout>
+              <property name="left_attach">7</property>
+              <property name="top_attach">3</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">7</property>
-            <property name="top_attach">3</property>
-          </packing>
         </child>
         <child>
           <object class="GtkBox" id="box13">
             <property name="width_request">50</property>
             <property name="height_request">50</property>
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="orientation">vertical</property>
             <child>
               <placeholder/>
@@ -574,30 +502,26 @@
             <style>
               <class name="red"/>
             </style>
+            <layout>
+              <property name="left_attach">7</property>
+              <property name="top_attach">4</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">7</property>
-            <property name="top_attach">4</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="label6">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="label" translatable="yes">--&gt;
 1x</property>
+            <layout>
+              <property name="left_attach">6</property>
+              <property name="top_attach">0</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">6</property>
-            <property name="top_attach">0</property>
-          </packing>
         </child>
         <child>
           <object class="GtkBox" id="box5">
             <property name="width_request">50</property>
             <property name="height_request">50</property>
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="orientation">vertical</property>
             <child>
               <placeholder/>
@@ -605,18 +529,16 @@
             <style>
               <class name="red"/>
             </style>
+            <layout>
+              <property name="left_attach">6</property>
+              <property name="top_attach">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">6</property>
-            <property name="top_attach">1</property>
-          </packing>
         </child>
         <child>
           <object class="GtkBox" id="box6">
             <property name="width_request">50</property>
             <property name="height_request">50</property>
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="orientation">vertical</property>
             <child>
               <placeholder/>
@@ -624,18 +546,16 @@
             <style>
               <class name="yellow"/>
             </style>
+            <layout>
+              <property name="left_attach">6</property>
+              <property name="top_attach">2</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">6</property>
-            <property name="top_attach">2</property>
-          </packing>
         </child>
         <child>
           <object class="GtkBox" id="box7">
             <property name="width_request">50</property>
             <property name="height_request">50</property>
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="orientation">vertical</property>
             <child>
               <placeholder/>
@@ -643,18 +563,16 @@
             <style>
               <class name="red"/>
             </style>
+            <layout>
+              <property name="left_attach">6</property>
+              <property name="top_attach">3</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">6</property>
-            <property name="top_attach">3</property>
-          </packing>
         </child>
         <child>
           <object class="GtkBox" id="box8">
             <property name="width_request">50</property>
             <property name="height_request">50</property>
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="orientation">vertical</property>
             <child>
               <placeholder/>
@@ -662,30 +580,26 @@
             <style>
               <class name="yellow"/>
             </style>
+            <layout>
+              <property name="left_attach">6</property>
+              <property name="top_attach">4</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">6</property>
-            <property name="top_attach">4</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="label5">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="label" translatable="yes">&lt;--
 1x</property>
+            <layout>
+              <property name="left_attach">5</property>
+              <property name="top_attach">0</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">5</property>
-            <property name="top_attach">0</property>
-          </packing>
         </child>
         <child>
           <object class="GtkBox" id="box1">
             <property name="width_request">50</property>
             <property name="height_request">50</property>
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="orientation">vertical</property>
             <child>
               <placeholder/>
@@ -693,18 +607,16 @@
             <style>
               <class name="yellow"/>
             </style>
+            <layout>
+              <property name="left_attach">5</property>
+              <property name="top_attach">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">5</property>
-            <property name="top_attach">1</property>
-          </packing>
         </child>
         <child>
           <object class="GtkBox" id="box2">
             <property name="width_request">50</property>
             <property name="height_request">50</property>
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="orientation">vertical</property>
             <child>
               <placeholder/>
@@ -712,18 +624,16 @@
             <style>
               <class name="red"/>
             </style>
+            <layout>
+              <property name="left_attach">5</property>
+              <property name="top_attach">2</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">5</property>
-            <property name="top_attach">2</property>
-          </packing>
         </child>
         <child>
           <object class="GtkBox" id="box3">
             <property name="width_request">50</property>
             <property name="height_request">50</property>
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="orientation">vertical</property>
             <child>
               <placeholder/>
@@ -731,18 +641,16 @@
             <style>
               <class name="yellow"/>
             </style>
+            <layout>
+              <property name="left_attach">5</property>
+              <property name="top_attach">3</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">5</property>
-            <property name="top_attach">3</property>
-          </packing>
         </child>
         <child>
           <object class="GtkBox" id="box4">
             <property name="width_request">50</property>
             <property name="height_request">50</property>
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="orientation">vertical</property>
             <child>
               <placeholder/>
@@ -750,42 +658,36 @@
             <style>
               <class name="red"/>
             </style>
+            <layout>
+              <property name="left_attach">5</property>
+              <property name="top_attach">4</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">5</property>
-            <property name="top_attach">4</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="label13">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="label" translatable="yes">&lt;--
 ⅕x</property>
+            <layout>
+              <property name="left_attach">3</property>
+              <property name="top_attach">0</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">3</property>
-            <property name="top_attach">0</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="label14">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="label" translatable="yes">--&gt;
 ⅕x</property>
+            <layout>
+              <property name="left_attach">4</property>
+              <property name="top_attach">0</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">4</property>
-            <property name="top_attach">0</property>
-          </packing>
         </child>
         <child>
           <object class="GtkBox" id="box33">
             <property name="width_request">50</property>
             <property name="height_request">50</property>
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="orientation">vertical</property>
             <child>
               <placeholder/>
@@ -793,18 +695,16 @@
             <style>
               <class name="yellow"/>
             </style>
+            <layout>
+              <property name="left_attach">3</property>
+              <property name="top_attach">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">3</property>
-            <property name="top_attach">1</property>
-          </packing>
         </child>
         <child>
           <object class="GtkBox" id="box34">
             <property name="width_request">50</property>
             <property name="height_request">50</property>
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="orientation">vertical</property>
             <child>
               <placeholder/>
@@ -812,18 +712,16 @@
             <style>
               <class name="lightorange"/>
             </style>
+            <layout>
+              <property name="left_attach">4</property>
+              <property name="top_attach">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">4</property>
-            <property name="top_attach">1</property>
-          </packing>
         </child>
         <child>
           <object class="GtkBox" id="box35">
             <property name="width_request">50</property>
             <property name="height_request">50</property>
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="orientation">vertical</property>
             <child>
               <placeholder/>
@@ -831,18 +729,16 @@
             <style>
               <class name="red"/>
             </style>
+            <layout>
+              <property name="left_attach">3</property>
+              <property name="top_attach">2</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">3</property>
-            <property name="top_attach">2</property>
-          </packing>
         </child>
         <child>
           <object class="GtkBox" id="box36">
             <property name="width_request">50</property>
             <property name="height_request">50</property>
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="orientation">vertical</property>
             <child>
               <placeholder/>
@@ -850,18 +746,16 @@
             <style>
               <class name="darkorange"/>
             </style>
+            <layout>
+              <property name="left_attach">4</property>
+              <property name="top_attach">2</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">4</property>
-            <property name="top_attach">2</property>
-          </packing>
         </child>
         <child>
           <object class="GtkBox" id="box37">
             <property name="width_request">50</property>
             <property name="height_request">50</property>
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="orientation">vertical</property>
             <child>
               <placeholder/>
@@ -869,18 +763,16 @@
             <style>
               <class name="yellow"/>
             </style>
+            <layout>
+              <property name="left_attach">3</property>
+              <property name="top_attach">3</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">3</property>
-            <property name="top_attach">3</property>
-          </packing>
         </child>
         <child>
           <object class="GtkBox" id="box38">
             <property name="width_request">50</property>
             <property name="height_request">50</property>
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="orientation">vertical</property>
             <child>
               <placeholder/>
@@ -888,18 +780,16 @@
             <style>
               <class name="red"/>
             </style>
+            <layout>
+              <property name="left_attach">3</property>
+              <property name="top_attach">4</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">3</property>
-            <property name="top_attach">4</property>
-          </packing>
         </child>
         <child>
           <object class="GtkBox" id="box39">
             <property name="width_request">50</property>
             <property name="height_request">50</property>
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="orientation">vertical</property>
             <child>
               <placeholder/>
@@ -907,18 +797,16 @@
             <style>
               <class name="lightorange"/>
             </style>
+            <layout>
+              <property name="left_attach">4</property>
+              <property name="top_attach">3</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">4</property>
-            <property name="top_attach">3</property>
-          </packing>
         </child>
         <child>
           <object class="GtkBox" id="box40">
             <property name="width_request">50</property>
             <property name="height_request">50</property>
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="orientation">vertical</property>
             <child>
               <placeholder/>
@@ -926,42 +814,36 @@
             <style>
               <class name="darkorange"/>
             </style>
+            <layout>
+              <property name="left_attach">4</property>
+              <property name="top_attach">4</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">4</property>
-            <property name="top_attach">4</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="label15">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="label" translatable="yes">&lt;--
 0x</property>
+            <layout>
+              <property name="left_attach">1</property>
+              <property name="top_attach">0</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">1</property>
-            <property name="top_attach">0</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="label16">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="label" translatable="yes">--&gt;
 0x</property>
+            <layout>
+              <property name="left_attach">2</property>
+              <property name="top_attach">0</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">2</property>
-            <property name="top_attach">0</property>
-          </packing>
         </child>
         <child>
           <object class="GtkBox" id="box41">
             <property name="width_request">50</property>
             <property name="height_request">50</property>
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="orientation">vertical</property>
             <child>
               <placeholder/>
@@ -969,18 +851,16 @@
             <style>
               <class name="yellow"/>
             </style>
+            <layout>
+              <property name="left_attach">1</property>
+              <property name="top_attach">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">1</property>
-            <property name="top_attach">1</property>
-          </packing>
         </child>
         <child>
           <object class="GtkBox" id="box42">
             <property name="width_request">50</property>
             <property name="height_request">50</property>
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="orientation">vertical</property>
             <child>
               <placeholder/>
@@ -988,18 +868,16 @@
             <style>
               <class name="red"/>
             </style>
+            <layout>
+              <property name="left_attach">1</property>
+              <property name="top_attach">2</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">1</property>
-            <property name="top_attach">2</property>
-          </packing>
         </child>
         <child>
           <object class="GtkBox" id="box43">
             <property name="width_request">50</property>
             <property name="height_request">50</property>
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="orientation">vertical</property>
             <child>
               <placeholder/>
@@ -1007,18 +885,16 @@
             <style>
               <class name="yellow"/>
             </style>
+            <layout>
+              <property name="left_attach">1</property>
+              <property name="top_attach">3</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">1</property>
-            <property name="top_attach">3</property>
-          </packing>
         </child>
         <child>
           <object class="GtkBox" id="box44">
             <property name="width_request">50</property>
             <property name="height_request">50</property>
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="orientation">vertical</property>
             <child>
               <placeholder/>
@@ -1026,18 +902,16 @@
             <style>
               <class name="red"/>
             </style>
+            <layout>
+              <property name="left_attach">1</property>
+              <property name="top_attach">4</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">1</property>
-            <property name="top_attach">4</property>
-          </packing>
         </child>
         <child>
           <object class="GtkBox" id="box45">
             <property name="width_request">50</property>
             <property name="height_request">50</property>
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="orientation">vertical</property>
             <child>
               <placeholder/>
@@ -1045,18 +919,16 @@
             <style>
               <class name="red"/>
             </style>
+            <layout>
+              <property name="left_attach">2</property>
+              <property name="top_attach">4</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">2</property>
-            <property name="top_attach">4</property>
-          </packing>
         </child>
         <child>
           <object class="GtkBox" id="box46">
             <property name="width_request">50</property>
             <property name="height_request">50</property>
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="orientation">vertical</property>
             <child>
               <placeholder/>
@@ -1064,18 +936,16 @@
             <style>
               <class name="yellow"/>
             </style>
+            <layout>
+              <property name="left_attach">2</property>
+              <property name="top_attach">3</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">2</property>
-            <property name="top_attach">3</property>
-          </packing>
         </child>
         <child>
           <object class="GtkBox" id="box47">
             <property name="width_request">50</property>
             <property name="height_request">50</property>
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="orientation">vertical</property>
             <child>
               <placeholder/>
@@ -1083,18 +953,16 @@
             <style>
               <class name="red"/>
             </style>
+            <layout>
+              <property name="left_attach">2</property>
+              <property name="top_attach">2</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">2</property>
-            <property name="top_attach">2</property>
-          </packing>
         </child>
         <child>
           <object class="GtkBox" id="box48">
             <property name="width_request">50</property>
             <property name="height_request">50</property>
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="orientation">vertical</property>
             <child>
               <placeholder/>
@@ -1102,11 +970,11 @@
             <style>
               <class name="yellow"/>
             </style>
+            <layout>
+              <property name="left_attach">2</property>
+              <property name="top_attach">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">2</property>
-            <property name="top_attach">1</property>
-          </packing>
         </child>
         <child>
           <placeholder/>

diff --git a/testsuite/reftests/animation-fill-mode-iteration-count.ui b/testsuite/reftests/animation-fill-mode-iteration-count.ui
index cfb64c74fab89c64636e837fdc8be65375396690..4f88c507cb051f7a7e04369da52d6beceb307b25 100644 (file)
--- a/testsuite/reftests/animation-fill-mode-iteration-count.ui
+++ b/testsuite/reftests/animation-fill-mode-iteration-count.ui
@@ -1,75 +1,59 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!-- Generated with glade 3.19.0 -->
 <interface>
   <requires lib="gtk+" version="3.16"/>
   <object class="GtkWindow" id="window1">
-    <property name="can_focus">False</property>
     <child>
       <object class="GtkGrid" id="grid1">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
         <child>
           <object class="GtkLabel" id="label1">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="label" translatable="yes">normal</property>
+            <layout>
+              <property name="left_attach">0</property>
+              <property name="top_attach">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">0</property>
-            <property name="top_attach">1</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="label2">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="label" translatable="yes">reverse</property>
+            <layout>
+              <property name="left_attach">0</property>
+              <property name="top_attach">2</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">0</property>
-            <property name="top_attach">2</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="label3">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="label" translatable="yes">alternate</property>
+            <layout>
+              <property name="left_attach">0</property>
+              <property name="top_attach">3</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">0</property>
-            <property name="top_attach">3</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="label4">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="label" translatable="yes">alternate-reverse</property>
+            <layout>
+              <property name="left_attach">0</property>
+              <property name="top_attach">4</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">0</property>
-            <property name="top_attach">4</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="label12">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="label" translatable="yes">--&gt;
 2⅕x</property>
+            <layout>
+              <property name="left_attach">12</property>
+              <property name="top_attach">0</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">12</property>
-            <property name="top_attach">0</property>
-          </packing>
         </child>
         <child>
           <object class="GtkBox" id="box31">
             <property name="width_request">50</property>
             <property name="height_request">50</property>
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="orientation">vertical</property>
             <child>
               <placeholder/>
@@ -79,18 +63,16 @@
               <class name="after"/>
               <class name="x22"/>
             </style>
+            <layout>
+              <property name="left_attach">12</property>
+              <property name="top_attach">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">12</property>
-            <property name="top_attach">1</property>
-          </packing>
         </child>
         <child>
           <object class="GtkBox" id="box32">
             <property name="width_request">50</property>
             <property name="height_request">50</property>
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="orientation">vertical</property>
             <child>
               <placeholder/>
@@ -100,18 +82,16 @@
               <class name="after"/>
               <class name="x22"/>
             </style>
+            <layout>
+              <property name="left_attach">12</property>
+              <property name="top_attach">2</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">12</property>
-            <property name="top_attach">2</property>
-          </packing>
         </child>
         <child>
           <object class="GtkBox" id="box30">
             <property name="width_request">50</property>
             <property name="height_request">50</property>
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="orientation">vertical</property>
             <child>
               <placeholder/>
@@ -121,18 +101,16 @@
               <class name="after"/>
               <class name="x22"/>
             </style>
+            <layout>
+              <property name="left_attach">12</property>
+              <property name="top_attach">3</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">12</property>
-            <property name="top_attach">3</property>
-          </packing>
         </child>
         <child>
           <object class="GtkBox" id="box29">
             <property name="width_request">50</property>
             <property name="height_request">50</property>
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="orientation">vertical</property>
             <child>
               <placeholder/>
@@ -142,30 +120,26 @@
               <class name="after"/>
               <class name="x22"/>
             </style>
+            <layout>
+              <property name="left_attach">12</property>
+              <property name="top_attach">4</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">12</property>
-            <property name="top_attach">4</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="label11">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="label" translatable="yes">&lt;--
 2⅕x</property>
+            <layout>
+              <property name="left_attach">11</property>
+              <property name="top_attach">0</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">11</property>
-            <property name="top_attach">0</property>
-          </packing>
         </child>
         <child>
           <object class="GtkBox" id="box18">
             <property name="width_request">50</property>
             <property name="height_request">50</property>
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="orientation">vertical</property>
             <child>
               <placeholder/>
@@ -175,18 +149,16 @@
               <class name="before"/>
               <class name="x22"/>
             </style>
+            <layout>
+              <property name="left_attach">11</property>
+              <property name="top_attach">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">11</property>
-            <property name="top_attach">1</property>
-          </packing>
         </child>
         <child>
           <object class="GtkBox" id="box26">
             <property name="width_request">50</property>
             <property name="height_request">50</property>
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="orientation">vertical</property>
             <child>
               <placeholder/>
@@ -196,18 +168,16 @@
               <class name="before"/>
               <class name="x22"/>
             </style>
+            <layout>
+              <property name="left_attach">11</property>
+              <property name="top_attach">2</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">11</property>
-            <property name="top_attach">2</property>
-          </packing>
         </child>
         <child>
           <object class="GtkBox" id="box27">
             <property name="width_request">50</property>
             <property name="height_request">50</property>
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="orientation">vertical</property>
             <child>
               <placeholder/>
@@ -217,18 +187,16 @@
               <class name="before"/>
               <class name="x22"/>
             </style>
+            <layout>
+              <property name="left_attach">11</property>
+              <property name="top_attach">3</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">11</property>
-            <property name="top_attach">3</property>
-          </packing>
         </child>
         <child>
           <object class="GtkBox" id="box28">
             <property name="width_request">50</property>
             <property name="height_request">50</property>
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="orientation">vertical</property>
             <child>
               <placeholder/>
@@ -238,18 +206,16 @@
               <class name="before"/>
               <class name="x22"/>
             </style>
+            <layout>
+              <property name="left_attach">11</property>
+              <property name="top_attach">4</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">11</property>
-            <property name="top_attach">4</property>
-          </packing>
         </child>
         <child>
           <object class="GtkBox" id="box22">
             <property name="width_request">50</property>
             <property name="height_request">50</property>
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="orientation">vertical</property>
             <child>
               <placeholder/>
@@ -259,18 +225,16 @@
               <class name="after"/>
               <class name="x2"/>
             </style>
+            <layout>
+              <property name="left_attach">10</property>
+              <property name="top_attach">4</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">10</property>
-            <property name="top_attach">4</property>
-          </packing>
         </child>
         <child>
           <object class="GtkBox" id="box23">
             <property name="width_request">50</property>
             <property name="height_request">50</property>
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="orientation">vertical</property>
             <child>
               <placeholder/>
@@ -280,18 +244,16 @@
               <class name="after"/>
               <class name="x2"/>
             </style>
+            <layout>
+              <property name="left_attach">10</property>
+              <property name="top_attach">3</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">10</property>
-            <property name="top_attach">3</property>
-          </packing>
         </child>
         <child>
           <object class="GtkBox" id="box24">
             <property name="width_request">50</property>
             <property name="height_request">50</property>
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="orientation">vertical</property>
             <child>
               <placeholder/>
@@ -301,18 +263,16 @@
               <class name="after"/>
               <class name="x2"/>
             </style>
+            <layout>
+              <property name="left_attach">10</property>
+              <property name="top_attach">2</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">10</property>
-            <property name="top_attach">2</property>
-          </packing>
         </child>
         <child>
           <object class="GtkBox" id="box25">
             <property name="width_request">50</property>
             <property name="height_request">50</property>
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="orientation">vertical</property>
             <child>
               <placeholder/>
@@ -322,42 +282,36 @@
               <class name="after"/>
               <class name="x2"/>
             </style>
+            <layout>
+              <property name="left_attach">10</property>
+              <property name="top_attach">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">10</property>
-            <property name="top_attach">1</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="label10">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="label" translatable="yes">--&gt;
 2x</property>
+            <layout>
+              <property name="left_attach">10</property>
+              <property name="top_attach">0</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">10</property>
-            <property name="top_attach">0</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="label9">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="label" translatable="yes">&lt;--
 2x</property>
+            <layout>
+              <property name="left_attach">9</property>
+              <property name="top_attach">0</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">9</property>
-            <property name="top_attach">0</property>
-          </packing>
         </child>
         <child>
           <object class="GtkBox" id="box17">
             <property name="width_request">50</property>
             <property name="height_request">50</property>
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="orientation">vertical</property>
             <child>
               <placeholder/>
@@ -367,18 +321,16 @@
               <class name="before"/>
               <class name="x2"/>
             </style>
+            <layout>
+              <property name="left_attach">9</property>
+              <property name="top_attach">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">9</property>
-            <property name="top_attach">1</property>
-          </packing>
         </child>
         <child>
           <object class="GtkBox" id="box19">
             <property name="width_request">50</property>
             <property name="height_request">50</property>
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="orientation">vertical</property>
             <child>
               <placeholder/>
@@ -388,18 +340,16 @@
               <class name="before"/>
               <class name="x2"/>
             </style>
+            <layout>
+              <property name="left_attach">9</property>
+              <property name="top_attach">2</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">9</property>
-            <property name="top_attach">2</property>
-          </packing>
         </child>
         <child>
           <object class="GtkBox" id="box20">
             <property name="width_request">50</property>
             <property name="height_request">50</property>
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="orientation">vertical</property>
             <child>
               <placeholder/>
@@ -409,18 +359,16 @@
               <class name="before"/>
               <class name="x2"/>
             </style>
+            <layout>
+              <property name="left_attach">9</property>
+              <property name="top_attach">3</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">9</property>
-            <property name="top_attach">3</property>
-          </packing>
         </child>
         <child>
           <object class="GtkBox" id="box21">
             <property name="width_request">50</property>
             <property name="height_request">50</property>
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="orientation">vertical</property>
             <child>
               <placeholder/>
@@ -430,30 +378,26 @@
               <class name="before"/>
               <class name="x2"/>
             </style>
+            <layout>
+              <property name="left_attach">9</property>
+              <property name="top_attach">4</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">9</property>
-            <property name="top_attach">4</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="label8">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="label" translatable="yes">--&gt;
 1⅕x</property>
+            <layout>
+              <property name="left_attach">8</property>
+              <property name="top_attach">0</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">8</property>
-            <property name="top_attach">0</property>
-          </packing>
         </child>
         <child>
           <object class="GtkBox" id="box10">
             <property name="width_request">50</property>
             <property name="height_request">50</property>
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="orientation">vertical</property>
             <child>
               <placeholder/>
@@ -463,18 +407,16 @@
               <class name="after"/>
               <class name="x12"/>
             </style>
+            <layout>
+              <property name="left_attach">8</property>
+              <property name="top_attach">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">8</property>
-            <property name="top_attach">1</property>
-          </packing>
         </child>
         <child>
           <object class="GtkBox" id="box16">
             <property name="width_request">50</property>
             <property name="height_request">50</property>
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="orientation">vertical</property>
             <child>
               <placeholder/>
@@ -484,18 +426,16 @@
               <class name="after"/>
               <class name="x12"/>
             </style>
+            <layout>
+              <property name="left_attach">8</property>
+              <property name="top_attach">2</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">8</property>
-            <property name="top_attach">2</property>
-          </packing>
         </child>
         <child>
           <object class="GtkBox" id="box15">
             <property name="width_request">50</property>
             <property name="height_request">50</property>
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="orientation">vertical</property>
             <child>
               <placeholder/>
@@ -505,18 +445,16 @@
               <class name="after"/>
               <class name="x12"/>
             </style>
+            <layout>
+              <property name="left_attach">8</property>
+              <property name="top_attach">3</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">8</property>
-            <property name="top_attach">3</property>
-          </packing>
         </child>
         <child>
           <object class="GtkBox" id="box14">
             <property name="width_request">50</property>
             <property name="height_request">50</property>
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="orientation">vertical</property>
             <child>
               <placeholder/>
@@ -526,18 +464,16 @@
               <class name="after"/>
               <class name="x12"/>
             </style>
+            <layout>
+              <property name="left_attach">8</property>
+              <property name="top_attach">4</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">8</property>
-            <property name="top_attach">4</property>
-          </packing>
         </child>
         <child>
           <object class="GtkBox" id="box13">
             <property name="width_request">50</property>
             <property name="height_request">50</property>
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="orientation">vertical</property>
             <child>
               <placeholder/>
@@ -547,18 +483,16 @@
               <class name="before"/>
               <class name="x12"/>
             </style>
+            <layout>
+              <property name="left_attach">7</property>
+              <property name="top_attach">4</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">7</property>
-            <property name="top_attach">4</property>
-          </packing>
         </child>
         <child>
           <object class="GtkBox" id="box12">
             <property name="width_request">50</property>
             <property name="height_request">50</property>
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="orientation">vertical</property>
             <child>
               <placeholder/>
@@ -568,18 +502,16 @@
               <class name="before"/>
               <class name="x12"/>
             </style>
+            <layout>
+              <property name="left_attach">7</property>
+              <property name="top_attach">3</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">7</property>
-            <property name="top_attach">3</property>
-          </packing>
         </child>
         <child>
           <object class="GtkBox" id="box11">
             <property name="width_request">50</property>
             <property name="height_request">50</property>
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="orientation">vertical</property>
             <child>
               <placeholder/>
@@ -589,18 +521,16 @@
               <class name="before"/>
               <class name="x12"/>
             </style>
+            <layout>
+              <property name="left_attach">7</property>
+              <property name="top_attach">2</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">7</property>
-            <property name="top_attach">2</property>
-          </packing>
         </child>
         <child>
           <object class="GtkBox" id="box9">
             <property name="width_request">50</property>
             <property name="height_request">50</property>
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="orientation">vertical</property>
             <child>
               <placeholder/>
@@ -610,42 +540,36 @@
               <class name="before"/>
               <class name="x12"/>
             </style>
+            <layout>
+              <property name="left_attach">7</property>
+              <property name="top_attach">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">7</property>
-            <property name="top_attach">1</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="label7">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="label" translatable="yes">&lt;--
 1⅕x</property>
+            <layout>
+              <property name="left_attach">7</property>
+              <property name="top_attach">0</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">7</property>
-            <property name="top_attach">0</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="label6">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="label" translatable="yes">--&gt;
 1x</property>
+            <layout>
+              <property name="left_attach">6</property>
+              <property name="top_attach">0</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">6</property>
-            <property name="top_attach">0</property>
-          </packing>
         </child>
         <child>
           <object class="GtkBox" id="box5">
             <property name="width_request">50</property>
             <property name="height_request">50</property>
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="orientation">vertical</property>
             <child>
               <placeholder/>
@@ -655,18 +579,16 @@
               <class name="after"/>
               <class name="x1"/>
             </style>
+            <layout>
+              <property name="left_attach">6</property>
+              <property name="top_attach">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">6</property>
-            <property name="top_attach">1</property>
-          </packing>
         </child>
         <child>
           <object class="GtkBox" id="box6">
             <property name="width_request">50</property>
             <property name="height_request">50</property>
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="orientation">vertical</property>
             <child>
               <placeholder/>
@@ -676,18 +598,16 @@
               <class name="after"/>
               <class name="x1"/>
             </style>
+            <layout>
+              <property name="left_attach">6</property>
+              <property name="top_attach">2</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">6</property>
-            <property name="top_attach">2</property>
-          </packing>
         </child>
         <child>
           <object class="GtkBox" id="box7">
             <property name="width_request">50</property>
             <property name="height_request">50</property>
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="orientation">vertical</property>
             <child>
               <placeholder/>
@@ -697,18 +617,16 @@
               <class name="after"/>
               <class name="x1"/>
             </style>
+            <layout>
+              <property name="left_attach">6</property>
+              <property name="top_attach">3</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">6</property>
-            <property name="top_attach">3</property>
-          </packing>
         </child>
         <child>
           <object class="GtkBox" id="box8">
             <property name="width_request">50</property>
             <property name="height_request">50</property>
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="orientation">vertical</property>
             <child>
               <placeholder/>
@@ -718,30 +636,26 @@
               <class name="after"/>
               <class name="x1"/>
             </style>
+            <layout>
+              <property name="left_attach">6</property>
+              <property name="top_attach">4</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">6</property>
-            <property name="top_attach">4</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="label5">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="label" translatable="yes">&lt;--
 1x</property>
+            <layout>
+              <property name="left_attach">5</property>
+              <property name="top_attach">0</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">5</property>
-            <property name="top_attach">0</property>
-          </packing>
         </child>
         <child>
           <object class="GtkBox" id="box1">
             <property name="width_request">50</property>
             <property name="height_request">50</property>
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="orientation">vertical</property>
             <child>
               <placeholder/>
@@ -751,18 +665,16 @@
               <class name="before"/>
               <class name="x1"/>
             </style>
+            <layout>
+              <property name="left_attach">5</property>
+              <property name="top_attach">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">5</property>
-            <property name="top_attach">1</property>
-          </packing>
         </child>
         <child>
           <object class="GtkBox" id="box2">
             <property name="width_request">50</property>
             <property name="height_request">50</property>
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="orientation">vertical</property>
             <child>
               <placeholder/>
@@ -772,18 +684,16 @@
               <class name="before"/>
               <class name="x1"/>
             </style>
+            <layout>
+              <property name="left_attach">5</property>
+              <property name="top_attach">2</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">5</property>
-            <property name="top_attach">2</property>
-          </packing>
         </child>
         <child>
           <object class="GtkBox" id="box3">
             <property name="width_request">50</property>
             <property name="height_request">50</property>
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="orientation">vertical</property>
             <child>
               <placeholder/>
@@ -793,18 +703,16 @@
               <class name="before"/>
               <class name="x1"/>
             </style>
+            <layout>
+              <property name="left_attach">5</property>
+              <property name="top_attach">3</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">5</property>
-            <property name="top_attach">3</property>
-          </packing>
         </child>
         <child>
           <object class="GtkBox" id="box4">
             <property name="width_request">50</property>
             <property name="height_request">50</property>
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="orientation">vertical</property>
             <child>
               <placeholder/>
@@ -814,42 +722,36 @@
               <class name="before"/>
               <class name="x1"/>
             </style>
+            <layout>
+              <property name="left_attach">5</property>
+              <property name="top_attach">4</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">5</property>
-            <property name="top_attach">4</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="label13">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="label" translatable="yes">&lt;--
 ⅕x</property>
+            <layout>
+              <property name="left_attach">3</property>
+              <property name="top_attach">0</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">3</property>
-            <property name="top_attach">0</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="label14">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="label" translatable="yes">--&gt;
 ⅕x</property>
+            <layout>
+              <property name="left_attach">4</property>
+              <property name="top_attach">0</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">4</property>
-            <property name="top_attach">0</property>
-          </packing>
         </child>
         <child>
           <object class="GtkBox" id="box33">
             <property name="width_request">50</property>
             <property name="height_request">50</property>
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="orientation">vertical</property>
             <child>
               <placeholder/>
@@ -859,18 +761,16 @@
               <class name="before"/>
               <class name="x02"/>
             </style>
+            <layout>
+              <property name="left_attach">3</property>
+              <property name="top_attach">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">3</property>
-            <property name="top_attach">1</property>
-          </packing>
         </child>
         <child>
           <object class="GtkBox" id="box34">
             <property name="width_request">50</property>
             <property name="height_request">50</property>
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="orientation">vertical</property>
             <child>
               <placeholder/>
@@ -880,18 +780,16 @@
               <class name="after"/>
               <class name="x02"/>
             </style>
+            <layout>
+              <property name="left_attach">4</property>
+              <property name="top_attach">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">4</property>
-            <property name="top_attach">1</property>
-          </packing>
         </child>
         <child>
           <object class="GtkBox" id="box35">
             <property name="width_request">50</property>
             <property name="height_request">50</property>
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="orientation">vertical</property>
             <child>
               <placeholder/>
@@ -901,18 +799,16 @@
               <class name="after"/>
               <class name="x02"/>
             </style>
+            <layout>
+              <property name="left_attach">4</property>
+              <property name="top_attach">2</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">4</property>
-            <property name="top_attach">2</property>
-          </packing>
         </child>
         <child>
           <object class="GtkBox" id="box36">
             <property name="width_request">50</property>
             <property name="height_request">50</property>
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="orientation">vertical</property>
             <child>
               <placeholder/>
@@ -922,18 +818,16 @@
               <class name="before"/>
               <class name="x02"/>
             </style>
+            <layout>
+              <property name="left_attach">3</property>
+              <property name="top_attach">2</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">3</property>
-            <property name="top_attach">2</property>
-          </packing>
         </child>
         <child>
           <object class="GtkBox" id="box37">
             <property name="width_request">50</property>
             <property name="height_request">50</property>
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="orientation">vertical</property>
             <child>
               <placeholder/>
@@ -943,18 +837,16 @@
               <class name="before"/>
               <class name="x02"/>
             </style>
+            <layout>
+              <property name="left_attach">3</property>
+              <property name="top_attach">3</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">3</property>
-            <property name="top_attach">3</property>
-          </packing>
         </child>
         <child>
           <object class="GtkBox" id="box38">
             <property name="width_request">50</property>
             <property name="height_request">50</property>
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="orientation">vertical</property>
             <child>
               <placeholder/>
@@ -964,18 +856,16 @@
               <class name="after"/>
               <class name="x02"/>
             </style>
+            <layout>
+              <property name="left_attach">4</property>
+              <property name="top_attach">3</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">4</property>
-            <property name="top_attach">3</property>
-          </packing>
         </child>
         <child>
           <object class="GtkBox" id="box39">
             <property name="width_request">50</property>
             <property name="height_request">50</property>
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="orientation">vertical</property>
             <child>
               <placeholder/>
@@ -985,18 +875,16 @@
               <class name="before"/>
               <class name="x02"/>
             </style>
+            <layout>
+              <property name="left_attach">3</property>
+              <property name="top_attach">4</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">3</property>
-            <property name="top_attach">4</property>
-          </packing>
         </child>
         <child>
           <object class="GtkBox" id="box40">
             <property name="width_request">50</property>
             <property name="height_request">50</property>
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="orientation">vertical</property>
             <child>
               <placeholder/>
@@ -1006,42 +894,36 @@
               <class name="after"/>
               <class name="x02"/>
             </style>
+            <layout>
+              <property name="left_attach">4</property>
+              <property name="top_attach">4</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">4</property>
-            <property name="top_attach">4</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="label15">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="label" translatable="yes">&lt;--
 0x</property>
+            <layout>
+              <property name="left_attach">1</property>
+              <property name="top_attach">0</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">1</property>
-            <property name="top_attach">0</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="label16">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="label" translatable="yes">--&gt;
 0x</property>
+            <layout>
+              <property name="left_attach">2</property>
+              <property name="top_attach">0</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">2</property>
-            <property name="top_attach">0</property>
-          </packing>
         </child>
         <child>
           <object class="GtkBox" id="box41">
             <property name="width_request">50</property>
             <property name="height_request">50</property>
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="orientation">vertical</property>
             <child>
               <placeholder/>
@@ -1051,18 +933,16 @@
               <class name="before"/>
               <class name="x0"/>
             </style>
+            <layout>
+              <property name="left_attach">1</property>
+              <property name="top_attach">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">1</property>
-            <property name="top_attach">1</property>
-          </packing>
         </child>
         <child>
           <object class="GtkBox" id="box42">
             <property name="width_request">50</property>
             <property name="height_request">50</property>
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="orientation">vertical</property>
             <child>
               <placeholder/>
@@ -1072,18 +952,16 @@
               <class name="after"/>
               <class name="x0"/>
             </style>
+            <layout>
+              <property name="left_attach">2</property>
+              <property name="top_attach">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">2</property>
-            <property name="top_attach">1</property>
-          </packing>
         </child>
         <child>
           <object class="GtkBox" id="box43">
             <property name="width_request">50</property>
             <property name="height_request">50</property>
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="orientation">vertical</property>
             <child>
               <placeholder/>
@@ -1093,18 +971,16 @@
               <class name="after"/>
               <class name="x0"/>
             </style>
+            <layout>
+              <property name="left_attach">2</property>
+              <property name="top_attach">2</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">2</property>
-            <property name="top_attach">2</property>
-          </packing>
         </child>
         <child>
           <object class="GtkBox" id="box44">
             <property name="width_request">50</property>
             <property name="height_request">50</property>
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="orientation">vertical</property>
             <child>
               <placeholder/>
@@ -1114,18 +990,16 @@
               <class name="after"/>
               <class name="x0"/>
             </style>
+            <layout>
+              <property name="left_attach">2</property>
+              <property name="top_attach">3</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">2</property>
-            <property name="top_attach">3</property>
-          </packing>
         </child>
         <child>
           <object class="GtkBox" id="box45">
             <property name="width_request">50</property>
             <property name="height_request">50</property>
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="orientation">vertical</property>
             <child>
               <placeholder/>
@@ -1135,18 +1009,16 @@
               <class name="after"/>
               <class name="x0"/>
             </style>
+            <layout>
+              <property name="left_attach">2</property>
+              <property name="top_attach">4</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">2</property>
-            <property name="top_attach">4</property>
-          </packing>
         </child>
         <child>
           <object class="GtkBox" id="box46">
             <property name="width_request">50</property>
             <property name="height_request">50</property>
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="orientation">vertical</property>
             <child>
               <placeholder/>
@@ -1156,18 +1028,16 @@
               <class name="before"/>
               <class name="x0"/>
             </style>
+            <layout>
+              <property name="left_attach">1</property>
+              <property name="top_attach">4</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">1</property>
-            <property name="top_attach">4</property>
-          </packing>
         </child>
         <child>
           <object class="GtkBox" id="box47">
             <property name="width_request">50</property>
             <property name="height_request">50</property>
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="orientation">vertical</property>
             <child>
               <placeholder/>
@@ -1177,18 +1047,16 @@
               <class name="before"/>
               <class name="x0"/>
             </style>
+            <layout>
+              <property name="left_attach">1</property>
+              <property name="top_attach">3</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">1</property>
-            <property name="top_attach">3</property>
-          </packing>
         </child>
         <child>
           <object class="GtkBox" id="box48">
             <property name="width_request">50</property>
             <property name="height_request">50</property>
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="orientation">vertical</property>
             <child>
               <placeholder/>
@@ -1198,11 +1066,11 @@
               <class name="before"/>
               <class name="x0"/>
             </style>
+            <layout>
+              <property name="left_attach">1</property>
+              <property name="top_attach">2</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">1</property>
-            <property name="top_attach">2</property>
-          </packing>
         </child>
         <child>
           <placeholder/>

diff --git a/testsuite/reftests/background-area.ref.ui b/testsuite/reftests/background-area.ref.ui
index 4d63083dd029702380aeffe1a338ef036de3a3ca..33789a1040f2df828e1efa626a007cd1b64d90e3 100644 (file)
--- a/testsuite/reftests/background-area.ref.ui
+++ b/testsuite/reftests/background-area.ref.ui
@@ -1,53 +1,45 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
-  <!-- interface-requires gtk+ 3.0 -->
   <object class="GtkWindow" id="window1">
-    <property name="can_focus">False</property>
     <property name="type">popup</property>
     <child>
       <object class="GtkBox" id="box1">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
         <property name="orientation">vertical</property>
         <property name="spacing">5</property>
         <child>
-         <object class="GtkButton" id="button1">
-           <property name="name">reference1</property>
-           <property name="visible">True</property>
-           <property name="can_focus">True</property>
-           <property name="receives_default">True</property>
-           <property name="width_request">144</property>
-           <property name="height_request">70</property>
-         </object>
-       </child>
+          <object class="GtkButton" id="button1">
+            <property name="name">reference1</property>
+            <property name="can_focus">1</property>
+            <property name="receives_default">1</property>
+            <property name="width_request">144</property>
+            <property name="height_request">70</property>
+          </object>
+        </child>
         <child>
-         <object class="GtkButton" id="button2">
-           <property name="name">reference2</property>
-           <property name="visible">True</property>
-           <property name="can_focus">True</property>
-           <property name="receives_default">True</property>
-           <property name="width_request">144</property>
-           <property name="height_request">70</property>
-         </object>
-       </child>
+          <object class="GtkButton" id="button2">
+            <property name="name">reference2</property>
+            <property name="can_focus">1</property>
+            <property name="receives_default">1</property>
+            <property name="width_request">144</property>
+            <property name="height_request">70</property>
+          </object>
+        </child>
         <child>
-         <object class="GtkButton" id="button3">
-           <property name="name">reference3</property>
-           <property name="visible">True</property>
-           <property name="can_focus">True</property>
-           <property name="receives_default">True</property>
-           <property name="width_request">144</property>
-           <property name="height_request">70</property>
-           <child>
-             <object class="GtkButton" id="button4">
-               <property name="name">reference3inner</property>
-               <property name="visible">True</property>
-               <property name="can_focus">True</property>
-               <property name="receives_default">True</property>
-             </object>
-           </child>
-         </object>
-       </child>
+          <object class="GtkButton" id="button3">
+            <property name="name">reference3</property>
+            <property name="can_focus">1</property>
+            <property name="receives_default">1</property>
+            <property name="width_request">144</property>
+            <property name="height_request">70</property>
+            <child>
+              <object class="GtkButton" id="button4">
+                <property name="name">reference3inner</property>
+                <property name="can_focus">1</property>
+                <property name="receives_default">1</property>
+              </object>
+            </child>
+          </object>
+        </child>
       </object>
     </child>
   </object>

diff --git a/testsuite/reftests/background-area.ui b/testsuite/reftests/background-area.ui
index d9f130383545b418888d376b2b2ca81b39f3b1da..f4b96de1d4190240dd6e4fbcc693498b0f0461b5 100644 (file)
--- a/testsuite/reftests/background-area.ui
+++ b/testsuite/reftests/background-area.ui
@@ -1,45 +1,38 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
-  <!-- interface-requires gtk+ 3.0 -->
   <object class="GtkWindow" id="window1">
-    <property name="can_focus">False</property>
     <property name="type">popup</property>
     <child>
       <object class="GtkBox" id="box1">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
         <property name="orientation">vertical</property>
         <property name="spacing">5</property>
         <child>
-         <object class="GtkButton" id="button1">
-           <property name="name">button1</property>
-           <property name="visible">True</property>
-           <property name="can_focus">True</property>
-           <property name="receives_default">True</property>
-           <property name="width_request">144</property>
-           <property name="height_request">70</property>
-         </object>
-       </child>
+          <object class="GtkButton" id="button1">
+            <property name="name">button1</property>
+            <property name="can_focus">1</property>
+            <property name="receives_default">1</property>
+            <property name="width_request">144</property>
+            <property name="height_request">70</property>
+          </object>
+        </child>
         <child>
-         <object class="GtkButton" id="button2">
-           <property name="name">button2</property>
-           <property name="visible">True</property>
-           <property name="can_focus">True</property>
-           <property name="receives_default">True</property>
-           <property name="width_request">144</property>
-           <property name="height_request">70</property>
-         </object>
-       </child>
+          <object class="GtkButton" id="button2">
+            <property name="name">button2</property>
+            <property name="can_focus">1</property>
+            <property name="receives_default">1</property>
+            <property name="width_request">144</property>
+            <property name="height_request">70</property>
+          </object>
+        </child>
         <child>
-         <object class="GtkButton" id="button3">
-           <property name="name">button3</property>
-           <property name="visible">True</property>
-           <property name="can_focus">True</property>
-           <property name="receives_default">True</property>
-           <property name="width_request">144</property>
-           <property name="height_request">70</property>
-         </object>
-       </child>
+          <object class="GtkButton" id="button3">
+            <property name="name">button3</property>
+            <property name="can_focus">1</property>
+            <property name="receives_default">1</property>
+            <property name="width_request">144</property>
+            <property name="height_request">70</property>
+          </object>
+        </child>
       </object>
     </child>
   </object>

diff --git a/testsuite/reftests/background-blend-mode-clip-interaction.ref.ui b/testsuite/reftests/background-blend-mode-clip-interaction.ref.ui
index fdedb423e235224de1ff914a86c2d0b9299f4ae7..d8e47d84e34e8470100526018e64547633ba4244 100644 (file)
--- a/testsuite/reftests/background-blend-mode-clip-interaction.ref.ui
+++ b/testsuite/reftests/background-blend-mode-clip-interaction.ref.ui
@@ -1,17 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
-  <!-- interface-requires gtk+ 3.0 -->
   <object class="GtkWindow" id="window1">
     <property name="width_request">50</property>
     <property name="height_request">50</property>
-    <property name="can_focus">False</property>
     <property name="type">popup</property>
     <property name="name">reference</property>
     <child>
-      <object class="GtkBox">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
-      </object>
+      <object class="GtkBox"/>
     </child>
   </object>
 </interface>

diff --git a/testsuite/reftests/background-blend-mode-clip-interaction.ui b/testsuite/reftests/background-blend-mode-clip-interaction.ui
index 82d787a57b55f6e943828be6a78c1fab7dff46ee..8b5af4d54e8a5903832edc16292a9a160aef43f5 100644 (file)
--- a/testsuite/reftests/background-blend-mode-clip-interaction.ui
+++ b/testsuite/reftests/background-blend-mode-clip-interaction.ui
@@ -1,16 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
-  <!-- interface-requires gtk+ 3.0 -->
   <object class="GtkWindow" id="window1">
     <property name="width_request">50</property>
     <property name="height_request">50</property>
-    <property name="can_focus">False</property>
     <property name="type">popup</property>
     <child>
-      <object class="GtkBox">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
-      </object>
+      <object class="GtkBox"/>
     </child>
   </object>
 </interface>

diff --git a/testsuite/reftests/background-color-transparent.ref.ui b/testsuite/reftests/background-color-transparent.ref.ui
index 1afe963e45b2b6472f125746cee6953e7d3699bf..d76a96e08c8ccf0575ee6b7aa9f03909c75e32b8 100644 (file)
--- a/testsuite/reftests/background-color-transparent.ref.ui
+++ b/testsuite/reftests/background-color-transparent.ref.ui
@@ -1,42 +1,36 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
-  <!-- interface-requires gtk+ 3.0 -->
   <object class="GtkWindow" id="window1">
-    <property name="can_focus">False</property>
     <child>
       <object class="GtkGrid" id="grid1">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
         <child>
           <object class="GtkButton" id="opaque">
             <property name="label" translatable="yes">opaque</property>
-            <property name="visible">True</property>
-            <property name="can_focus">True</property>
-            <property name="receives_default">True</property>
+            <property name="can_focus">1</property>
+            <property name="receives_default">1</property>
+            <layout>
+              <property name="left_attach">0</property>
+              <property name="top_attach">0</property>
+              <property name="column-span">1</property>
+              <property name="row-span">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">0</property>
-            <property name="top_attach">0</property>
-            <property name="width">1</property>
-            <property name="height">1</property>
-          </packing>
         </child>
         <child>
           <object class="GtkButton" id="transparent">
             <property name="label" translatable="yes">transparent</property>
-            <property name="visible">True</property>
-            <property name="can_focus">True</property>
-            <property name="receives_default">True</property>
+            <property name="can_focus">1</property>
+            <property name="receives_default">1</property>
             <style>
-              <class name="reference" />
+              <class name="reference"/>
             </style>
+            <layout>
+              <property name="left_attach">0</property>
+              <property name="top_attach">1</property>
+              <property name="column-span">1</property>
+              <property name="row-span">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">0</property>
-            <property name="top_attach">1</property>
-            <property name="width">1</property>
-            <property name="height">1</property>
-          </packing>
         </child>
       </object>
     </child>

diff --git a/testsuite/reftests/background-color-transparent.ui b/testsuite/reftests/background-color-transparent.ui
index f0bcfce9e9fe042eb62e63ee54600861557fd35a..07c53021d54bcc856ccfd4e93b3e25f7606dafc6 100644 (file)
--- a/testsuite/reftests/background-color-transparent.ui
+++ b/testsuite/reftests/background-color-transparent.ui
@@ -1,42 +1,36 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
-  <!-- interface-requires gtk+ 3.0 -->
   <object class="GtkWindow" id="window1">
-    <property name="can_focus">False</property>
     <child>
       <object class="GtkGrid" id="grid1">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
         <child>
           <object class="GtkButton" id="opaque">
             <property name="label" translatable="yes">opaque</property>
-            <property name="visible">True</property>
-            <property name="can_focus">True</property>
-            <property name="receives_default">True</property>
+            <property name="can_focus">1</property>
+            <property name="receives_default">1</property>
+            <layout>
+              <property name="left_attach">0</property>
+              <property name="top_attach">0</property>
+              <property name="column-span">1</property>
+              <property name="row-span">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">0</property>
-            <property name="top_attach">0</property>
-            <property name="width">1</property>
-            <property name="height">1</property>
-          </packing>
         </child>
         <child>
           <object class="GtkButton" id="transparent">
             <property name="label" translatable="yes">transparent</property>
-            <property name="visible">True</property>
-            <property name="can_focus">True</property>
-            <property name="receives_default">True</property>
+            <property name="can_focus">1</property>
+            <property name="receives_default">1</property>
             <style>
-              <class name="transparent" />
+              <class name="transparent"/>
             </style>
+            <layout>
+              <property name="left_attach">0</property>
+              <property name="top_attach">1</property>
+              <property name="column-span">1</property>
+              <property name="row-span">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">0</property>
-            <property name="top_attach">1</property>
-            <property name="width">1</property>
-            <property name="height">1</property>
-          </packing>
         </child>
       </object>
     </child>

diff --git a/testsuite/reftests/background-image-multiple.ref.ui b/testsuite/reftests/background-image-multiple.ref.ui
index e8218af6b1284ef0486d10c66bd375670057f046..079929abf1cb7bc1c0653f2b1ecf0c3077aac27d 100644 (file)
--- a/testsuite/reftests/background-image-multiple.ref.ui
+++ b/testsuite/reftests/background-image-multiple.ref.ui
@@ -1,117 +1,102 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
-  <!-- interface-requires gtk+ 3.0 -->
   <object class="GtkWindow" id="window1">
-    <property name="can_focus">False</property>
     <property name="type">popup</property>
     <child>
       <object class="GtkBox" id="box1">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
         <property name="orientation">vertical</property>
         <property name="spacing">5</property>
         <child>
-         <object class="GtkButton" id="ref1">
-           <property name="name">ref1</property>
-           <property name="visible">True</property>
-           <property name="can_focus">True</property>
-           <property name="receives_default">True</property>
-           <property name="width_request">144</property>
-           <property name="height_request">70</property>
-         </object>
-       </child>
+          <object class="GtkButton" id="ref1">
+            <property name="name">ref1</property>
+            <property name="can_focus">1</property>
+            <property name="receives_default">1</property>
+            <property name="width_request">144</property>
+            <property name="height_request">70</property>
+          </object>
+        </child>
         <child>
-         <object class="GtkButton" id="ref2">
-           <property name="name">ref2</property>
-           <property name="visible">True</property>
-           <property name="can_focus">True</property>
-           <property name="receives_default">True</property>
-           <property name="width_request">144</property>
-           <property name="height_request">70</property>
-         </object>
-       </child>
+          <object class="GtkButton" id="ref2">
+            <property name="name">ref2</property>
+            <property name="can_focus">1</property>
+            <property name="receives_default">1</property>
+            <property name="width_request">144</property>
+            <property name="height_request">70</property>
+          </object>
+        </child>
         <child>
-         <object class="GtkButton" id="ref3">
-           <property name="name">ref3</property>
-           <property name="visible">True</property>
-           <property name="can_focus">True</property>
-           <property name="receives_default">True</property>
-           <property name="width_request">144</property>
-           <property name="height_request">70</property>
-         </object>
-       </child>
+          <object class="GtkButton" id="ref3">
+            <property name="name">ref3</property>
+            <property name="can_focus">1</property>
+            <property name="receives_default">1</property>
+            <property name="width_request">144</property>
+            <property name="height_request">70</property>
+          </object>
+        </child>
         <child>
-         <object class="GtkFixed" id="fixed1">
-           <property name="visible">True</property>
-           <property name="can_focus">False</property>
-           <property name="width_request">144</property>
-           <property name="height_request">70</property>
+          <object class="GtkFixed" id="fixed1">
+            <property name="width_request">144</property>
+            <property name="height_request">70</property>
             <child>
               <object class="GtkButton" id="ref4-bg">
-               <property name="name">ref4-bg</property>
-               <property name="visible">True</property>
-               <property name="can_focus">True</property>
-               <property name="receives_default">True</property>
-               <property name="width_request">144</property>
-               <property name="height_request">70</property>
+                <property name="name">ref4-bg</property>
+                <property name="can_focus">1</property>
+                <property name="receives_default">1</property>
+                <property name="width_request">144</property>
+                <property name="height_request">70</property>
+                <layout>
+                  <property name="x">0</property>
+                  <property name="y">0</property>
+                </layout>
               </object>
-              <packing>
-                <property name="x">0</property>
-                <property name="y">0</property>
-              </packing>
             </child>
             <child>
               <object class="GtkButton" id="ref4-fg">
-               <property name="name">ref4-fg</property>
-               <property name="visible">True</property>
-               <property name="can_focus">True</property>
-               <property name="receives_default">True</property>
-               <property name="width_request">120</property>
-               <property name="height_request">46</property>
+                <property name="name">ref4-fg</property>
+                <property name="can_focus">1</property>
+                <property name="receives_default">1</property>
+                <property name="width_request">120</property>
+                <property name="height_request">46</property>
+                <layout>
+                  <property name="x">12</property>
+                  <property name="y">12</property>
+                </layout>
               </object>
-              <packing>
-                <property name="x">12</property>
-                <property name="y">12</property>
-              </packing>
             </child>
-         </object>
-       </child>
+          </object>
+        </child>
         <child>
-         <object class="GtkFixed" id="fixed2">
-           <property name="visible">True</property>
-           <property name="can_focus">False</property>
-           <property name="width_request">144</property>
-           <property name="height_request">70</property>
+          <object class="GtkFixed" id="fixed2">
+            <property name="width_request">144</property>
+            <property name="height_request">70</property>
             <child>
               <object class="GtkButton" id="ref5-bg">
-               <property name="name">ref5-bg</property>
-               <property name="visible">True</property>
-               <property name="can_focus">True</property>
-               <property name="receives_default">True</property>
-               <property name="width_request">144</property>
-               <property name="height_request">70</property>
+                <property name="name">ref5-bg</property>
+                <property name="can_focus">1</property>
+                <property name="receives_default">1</property>
+                <property name="width_request">144</property>
+                <property name="height_request">70</property>
+                <layout>
+                  <property name="x">0</property>
+                  <property name="y">0</property>
+                </layout>
               </object>
-              <packing>
-                <property name="x">0</property>
-                <property name="y">0</property>
-              </packing>
             </child>
             <child>
               <object class="GtkButton" id="ref5-fg">
-               <property name="name">ref5-fg</property>
-               <property name="visible">True</property>
-               <property name="can_focus">True</property>
-               <property name="receives_default">True</property>
-               <property name="width_request">120</property>
-               <property name="height_request">46</property>
+                <property name="name">ref5-fg</property>
+                <property name="can_focus">1</property>
+                <property name="receives_default">1</property>
+                <property name="width_request">120</property>
+                <property name="height_request">46</property>
+                <layout>
+                  <property name="x">12</property>
+                  <property name="y">12</property>
+                </layout>
               </object>
-              <packing>
-                <property name="x">12</property>
-                <property name="y">12</property>
-              </packing>
             </child>
-         </object>
-       </child>
+          </object>
+        </child>
       </object>
     </child>
   </object>

diff --git a/testsuite/reftests/background-image-multiple.ui b/testsuite/reftests/background-image-multiple.ui
index 1d212e61368e40b60f2a63b29f246f7cba1aa1b1..b30e02f939c0f2abc8aee9c8d8c61d2a259249a5 100644 (file)
--- a/testsuite/reftests/background-image-multiple.ui
+++ b/testsuite/reftests/background-image-multiple.ui
@@ -1,65 +1,56 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
-  <!-- interface-requires gtk+ 3.0 -->
   <object class="GtkWindow" id="window1">
-    <property name="can_focus">False</property>
     <property name="type">popup</property>
     <child>
       <object class="GtkBox" id="box1">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
         <property name="orientation">vertical</property>
         <property name="spacing">5</property>
         <child>
-         <object class="GtkButton" id="button1">
-           <property name="name">button1</property>
-           <property name="visible">True</property>
-           <property name="can_focus">True</property>
-           <property name="receives_default">True</property>
-           <property name="width_request">144</property>
-           <property name="height_request">70</property>
-         </object>
-       </child>
+          <object class="GtkButton" id="button1">
+            <property name="name">button1</property>
+            <property name="can_focus">1</property>
+            <property name="receives_default">1</property>
+            <property name="width_request">144</property>
+            <property name="height_request">70</property>
+          </object>
+        </child>
         <child>
-         <object class="GtkButton" id="button2">
-           <property name="name">button2</property>
-           <property name="visible">True</property>
-           <property name="can_focus">True</property>
-           <property name="receives_default">True</property>
-           <property name="width_request">144</property>
-           <property name="height_request">70</property>
-         </object>
-       </child>
+          <object class="GtkButton" id="button2">
+            <property name="name">button2</property>
+            <property name="can_focus">1</property>
+            <property name="receives_default">1</property>
+            <property name="width_request">144</property>
+            <property name="height_request">70</property>
+          </object>
+        </child>
         <child>
-         <object class="GtkButton" id="button3">
-           <property name="name">button3</property>
-           <property name="visible">True</property>
-           <property name="can_focus">True</property>
-           <property name="receives_default">True</property>
-           <property name="width_request">144</property>
-           <property name="height_request">70</property>
-         </object>
-       </child>
+          <object class="GtkButton" id="button3">
+            <property name="name">button3</property>
+            <property name="can_focus">1</property>
+            <property name="receives_default">1</property>
+            <property name="width_request">144</property>
+            <property name="height_request">70</property>
+          </object>
+        </child>
         <child>
-         <object class="GtkButton" id="button4">
-           <property name="name">button4</property>
-           <property name="visible">True</property>
-           <property name="can_focus">True</property>
-           <property name="receives_default">True</property>
-           <property name="width_request">144</property>
-           <property name="height_request">70</property>
-         </object>
-       </child>
+          <object class="GtkButton" id="button4">
+            <property name="name">button4</property>
+            <property name="can_focus">1</property>
+            <property name="receives_default">1</property>
+            <property name="width_request">144</property>
+            <property name="height_request">70</property>
+          </object>
+        </child>
         <child>
-         <object class="GtkButton" id="button5">
-           <property name="name">button5</property>
-           <property name="visible">True</property>
-           <property name="can_focus">True</property>
-           <property name="receives_default">True</property>
-           <property name="width_request">144</property>
-           <property name="height_request">70</property>
-         </object>
-       </child>
+          <object class="GtkButton" id="button5">
+            <property name="name">button5</property>
+            <property name="can_focus">1</property>
+            <property name="receives_default">1</property>
+            <property name="width_request">144</property>
+            <property name="height_request">70</property>
+          </object>
+        </child>
       </object>
     </child>
   </object>

diff --git a/testsuite/reftests/background-origin.ref.ui b/testsuite/reftests/background-origin.ref.ui
index 804fd5661555c2f86aaf522cf276dc92decbd003..bb9080172accd38c0137a9fbcb01c550c6f857af 100644 (file)
--- a/testsuite/reftests/background-origin.ref.ui
+++ b/testsuite/reftests/background-origin.ref.ui
@@ -1,17 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
-  <!-- interface-requires gtk+ 3.0 -->
   <object class="GtkWindow" id="window1">
-    <property name="can_focus">False</property>
     <property name="type">popup</property>
     <property name="width_request">154</property>
     <property name="height_request">680</property>
     <child>
       <object class="GtkButton" id="button">
-       <property name="name">reference</property>
-       <property name="visible">True</property>
-       <property name="can_focus">True</property>
-       <property name="receives_default">True</property>
+        <property name="name">reference</property>
+        <property name="can_focus">1</property>
+        <property name="receives_default">1</property>
       </object>
     </child>
   </object>

diff --git a/testsuite/reftests/background-origin.ui b/testsuite/reftests/background-origin.ui
index ab28b735f2e1db96d6bac45cd1026d3444365fb1..061c285cb1655f65e5b526eccf9fbbcaa4d2b453 100644 (file)
--- a/testsuite/reftests/background-origin.ui
+++ b/testsuite/reftests/background-origin.ui
@@ -1,105 +1,92 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
-  <!-- interface-requires gtk+ 3.0 -->
   <object class="GtkWindow" id="window1">
-    <property name="can_focus">False</property>
     <property name="type">popup</property>
     <child>
       <object class="GtkBox" id="box1">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
         <property name="orientation">vertical</property>
         <property name="spacing">5</property>
         <child>
-         <object class="GtkButton" id="button1">
-           <property name="name">button1</property>
-           <property name="visible">True</property>
-           <property name="can_focus">True</property>
-           <property name="receives_default">True</property>
-           <property name="width_request">144</property>
-           <property name="height_request">70</property>
-         </object>
-       </child>
+          <object class="GtkButton" id="button1">
+            <property name="name">button1</property>
+            <property name="can_focus">1</property>
+            <property name="receives_default">1</property>
+            <property name="width_request">144</property>
+            <property name="height_request">70</property>
+          </object>
+        </child>
         <child>
-         <object class="GtkButton" id="button2">
-           <property name="name">button2</property>
-           <property name="visible">True</property>
-           <property name="can_focus">True</property>
-           <property name="receives_default">True</property>
-           <property name="width_request">144</property>
-           <property name="height_request">70</property>
-         </object>
-       </child>
+          <object class="GtkButton" id="button2">
+            <property name="name">button2</property>
+            <property name="can_focus">1</property>
+            <property name="receives_default">1</property>
+            <property name="width_request">144</property>
+            <property name="height_request">70</property>
+          </object>
+        </child>
         <child>
-         <object class="GtkButton" id="button3">
-           <property name="name">button3</property>
-           <property name="visible">True</property>
-           <property name="can_focus">True</property>
-           <property name="receives_default">True</property>
-           <property name="width_request">144</property>
-           <property name="height_request">70</property>
-         </object>
-       </child>
+          <object class="GtkButton" id="button3">
+            <property name="name">button3</property>
+            <property name="can_focus">1</property>
+            <property name="receives_default">1</property>
+            <property name="width_request">144</property>
+            <property name="height_request">70</property>
+          </object>
+        </child>
         <child>
-         <object class="GtkButton" id="button4">
-           <property name="name">button4</property>
-           <property name="visible">True</property>
-           <property name="can_focus">True</property>
-           <property name="receives_default">True</property>
-           <property name="width_request">144</property>
-           <property name="height_request">70</property>
-         </object>
-       </child>
+          <object class="GtkButton" id="button4">
+            <property name="name">button4</property>
+            <property name="can_focus">1</property>
+            <property name="receives_default">1</property>
+            <property name="width_request">144</property>
+            <property name="height_request">70</property>
+          </object>
+        </child>
         <child>
-         <object class="GtkButton" id="button5">
-           <property name="name">button5</property>
-           <property name="visible">True</property>
-           <property name="can_focus">True</property>
-           <property name="receives_default">True</property>
-           <property name="width_request">144</property>
-           <property name="height_request">70</property>
-         </object>
-       </child>
+          <object class="GtkButton" id="button5">
+            <property name="name">button5</property>
+            <property name="can_focus">1</property>
+            <property name="receives_default">1</property>
+            <property name="width_request">144</property>
+            <property name="height_request">70</property>
+          </object>
+        </child>
         <child>
-         <object class="GtkButton" id="button6">
-           <property name="name">button6</property>
-           <property name="visible">True</property>
-           <property name="can_focus">True</property>
-           <property name="receives_default">True</property>
-           <property name="width_request">144</property>
-           <property name="height_request">70</property>
-         </object>
-       </child>
+          <object class="GtkButton" id="button6">
+            <property name="name">button6</property>
+            <property name="can_focus">1</property>
+            <property name="receives_default">1</property>
+            <property name="width_request">144</property>
+            <property name="height_request">70</property>
+          </object>
+        </child>
         <child>
-         <object class="GtkButton" id="button7">
-           <property name="name">button7</property>
-           <property name="visible">True</property>
-           <property name="can_focus">True</property>
-           <property name="receives_default">True</property>
-           <property name="width_request">144</property>
-           <property name="height_request">70</property>
-         </object>
-       </child>
+          <object class="GtkButton" id="button7">
+            <property name="name">button7</property>
+            <property name="can_focus">1</property>
+            <property name="receives_default">1</property>
+            <property name="width_request">144</property>
+            <property name="height_request">70</property>
+          </object>
+        </child>
         <child>
-         <object class="GtkButton" id="button8">
-           <property name="name">button8</property>
-           <property name="visible">True</property>
-           <property name="can_focus">True</property>
-           <property name="receives_default">True</property>
-           <property name="width_request">144</property>
-           <property name="height_request">70</property>
-         </object>
-       </child>
+          <object class="GtkButton" id="button8">
+            <property name="name">button8</property>
+            <property name="can_focus">1</property>
+            <property name="receives_default">1</property>
+            <property name="width_request">144</property>
+            <property name="height_request">70</property>
+          </object>
+        </child>
         <child>
-         <object class="GtkButton" id="button9">
-           <property name="name">button9</property>
-           <property name="visible">True</property>
-           <property name="can_focus">True</property>
-           <property name="receives_default">True</property>
-           <property name="width_request">144</property>
-           <property name="height_request">70</property>
-         </object>
-       </child>
+          <object class="GtkButton" id="button9">
+            <property name="name">button9</property>
+            <property name="can_focus">1</property>
+            <property name="receives_default">1</property>
+            <property name="width_request">144</property>
+            <property name="height_request">70</property>
+          </object>
+        </child>
       </object>
     </child>
   </object>

diff --git a/testsuite/reftests/background-position-repeat.ref.ui b/testsuite/reftests/background-position-repeat.ref.ui
index 5a25d1be7c1b9dba5c83e20daefb6005c578ceb6..399e9b34a491bd43d022b7082d8924096e495dc0 100644 (file)
--- a/testsuite/reftests/background-position-repeat.ref.ui
+++ b/testsuite/reftests/background-position-repeat.ref.ui
@@ -1,17 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
-  <!-- interface-requires gtk+ 3.0 -->
   <object class="GtkWindow" id="window1">
-    <property name="can_focus">False</property>
     <property name="type">popup</property>
     <child>
       <object class="GtkButton" id="button1_ref">
         <property name="name">button1_ref</property>
         <property name="width_request">40</property>
         <property name="height_request">41</property>
-        <property name="visible">True</property>
-        <property name="can_focus">True</property>
-        <property name="receives_default">True</property>
+        <property name="can_focus">1</property>
+        <property name="receives_default">1</property>
       </object>
     </child>
   </object>

diff --git a/testsuite/reftests/background-position-repeat.ui b/testsuite/reftests/background-position-repeat.ui
index 057db36567e855b891c3971b161a8347792f2370..28c855bcba9ada8cae84f6b7db49d0dbeb3f50e5 100644 (file)
--- a/testsuite/reftests/background-position-repeat.ui
+++ b/testsuite/reftests/background-position-repeat.ui
@@ -1,17 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
-  <!-- interface-requires gtk+ 3.0 -->
   <object class="GtkWindow" id="window1">
-    <property name="can_focus">False</property>
     <property name="type">popup</property>
     <child>
       <object class="GtkButton" id="button1">
         <property name="name">button1</property>
         <property name="width_request">40</property>
         <property name="height_request">41</property>
-        <property name="visible">True</property>
-        <property name="can_focus">True</property>
-        <property name="receives_default">True</property>
+        <property name="can_focus">1</property>
+        <property name="receives_default">1</property>
       </object>
     </child>
   </object>

diff --git a/testsuite/reftests/background-position-simple.ref.ui b/testsuite/reftests/background-position-simple.ref.ui
index a3367df2491ef2d652f3cb73d76792d910f9239c..73a6a91297543b9115a75b8674debb6b731017ca 100644 (file)
--- a/testsuite/reftests/background-position-simple.ref.ui
+++ b/testsuite/reftests/background-position-simple.ref.ui
@@ -1,11 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
-  <!-- interface-requires gtk+ 3.0 -->
   <object class="GtkWindow" id="window1">
     <property name="name">reference</property>
     <property name="width_request">40</property>
     <property name="height_request">40</property>
-    <property name="can_focus">False</property>
     <property name="type">popup</property>
     <child>
       <placeholder/>

diff --git a/testsuite/reftests/background-position-simple.ui b/testsuite/reftests/background-position-simple.ui
index 27849e15e4581affbc4500423a4e398e43df70c0..a15b766c8ba0849c3e645f338343f10f733af45c 100644 (file)
--- a/testsuite/reftests/background-position-simple.ui
+++ b/testsuite/reftests/background-position-simple.ui
@@ -1,10 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
-  <!-- interface-requires gtk+ 3.0 -->
   <object class="GtkWindow" id="window1">
     <property name="width_request">40</property>
     <property name="height_request">40</property>
-    <property name="can_focus">False</property>
     <property name="type">popup</property>
     <child>
       <placeholder/>

diff --git a/testsuite/reftests/background-position.ref.ui b/testsuite/reftests/background-position.ref.ui
index abbbec1aaac60b6671daecb7398150037a8fd9a6..627a16f65654a69a11d565829ff56654c2f047bf 100644 (file)
--- a/testsuite/reftests/background-position.ref.ui
+++ b/testsuite/reftests/background-position.ref.ui
@@ -1,141 +1,128 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
-  <!-- interface-requires gtk+ 3.0 -->
   <object class="GtkWindow" id="window1">
-    <property name="can_focus">False</property>
     <property name="type">popup</property>
     <property name="name">ref</property>
     <child>
       <object class="GtkFixed" id="fixed1">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
-            <property name="width_request">120</property>
-            <property name="height_request">120</property>
+        <property name="width_request">120</property>
+        <property name="height_request">120</property>
         <child>
           <object class="GtkButton" id="button1">
             <property name="width_request">20</property>
             <property name="height_request">20</property>
-            <property name="visible">True</property>
-            <property name="can_focus">True</property>
-            <property name="receives_default">True</property>
+            <property name="can_focus">1</property>
+            <property name="receives_default">1</property>
             <property name="name">ref</property>
+            <layout>
+              <property name="x">10</property>
+              <property name="y">10</property>
+            </layout>
           </object>
-          <packing>
-            <property name="x">10</property>
-            <property name="y">10</property>
-         </packing>
         </child>
         <child>
           <object class="GtkButton" id="button2">
             <property name="width_request">20</property>
             <property name="height_request">20</property>
-            <property name="visible">True</property>
-            <property name="can_focus">True</property>
-            <property name="receives_default">True</property>
+            <property name="can_focus">1</property>
+            <property name="receives_default">1</property>
             <property name="name">ref</property>
+            <layout>
+              <property name="x">40</property>
+              <property name="y">10</property>
+            </layout>
           </object>
-          <packing>
-            <property name="x">40</property>
-            <property name="y">10</property>
-         </packing>
         </child>
         <child>
           <object class="GtkButton" id="button3">
             <property name="width_request">20</property>
             <property name="height_request">20</property>
-            <property name="visible">True</property>
-            <property name="can_focus">True</property>
-            <property name="receives_default">True</property>
+            <property name="can_focus">1</property>
+            <property name="receives_default">1</property>
             <property name="name">ref</property>
+            <layout>
+              <property name="x">80</property>
+              <property name="y">20</property>
+            </layout>
           </object>
-          <packing>
-            <property name="x">80</property>
-            <property name="y">20</property>
-          </packing>
         </child>
         <child>
           <object class="GtkButton" id="button4">
             <property name="width_request">20</property>
             <property name="height_request">20</property>
-            <property name="visible">True</property>
-            <property name="can_focus">True</property>
-            <property name="receives_default">True</property>
+            <property name="can_focus">1</property>
+            <property name="receives_default">1</property>
             <property name="name">ref</property>
+            <layout>
+              <property name="x">20</property>
+              <property name="y">60</property>
+            </layout>
           </object>
-          <packing>
-            <property name="x">20</property>
-            <property name="y">60</property>
-          </packing>
         </child>
         <child>
           <object class="GtkButton" id="button5">
             <property name="width_request">20</property>
             <property name="height_request">20</property>
-            <property name="visible">True</property>
-            <property name="can_focus">True</property>
-            <property name="receives_default">True</property>
+            <property name="can_focus">1</property>
+            <property name="receives_default">1</property>
             <property name="name">ref</property>
+            <layout>
+              <property name="x">60</property>
+              <property name="y">40</property>
+            </layout>
           </object>
-          <packing>
-            <property name="x">60</property>
-            <property name="y">40</property>
-          </packing>
         </child>
         <child>
           <object class="GtkButton" id="button6">
             <property name="width_request">20</property>
             <property name="height_request">20</property>
-            <property name="visible">True</property>
-            <property name="can_focus">True</property>
-            <property name="receives_default">True</property>
+            <property name="can_focus">1</property>
+            <property name="receives_default">1</property>
             <property name="name">ref</property>
+            <layout>
+              <property name="x">100</property>
+              <property name="y">50</property>
+            </layout>
           </object>
-          <packing>
-            <property name="x">100</property>
-            <property name="y">50</property>
-          </packing>
         </child>
         <child>
           <object class="GtkButton" id="button7">
             <property name="width_request">20</property>
             <property name="height_request">20</property>
-            <property name="visible">True</property>
-            <property name="can_focus">True</property>
-            <property name="receives_default">True</property>
+            <property name="can_focus">1</property>
+            <property name="receives_default">1</property>
             <property name="name">ref</property>
+            <layout>
+              <property name="x">10</property>
+              <property name="y">90</property>
+            </layout>
           </object>
-          <packing>
-            <property name="x">10</property>
-            <property name="y">90</property>
-          </packing>
         </child>
         <child>
           <object class="GtkButton" id="button8">
             <property name="width_request">10</property>
             <property name="height_request">20</property>
-            <property name="visible">True</property>
-            <property name="can_focus">True</property>
-            <property name="receives_default">True</property>
+            <property name="can_focus">1</property>
+            <property name="receives_default">1</property>
             <property name="name">ref</property>
+            <layout>
+              <property name="x">40</property>
+              <property name="y">90</property>
+            </layout>
           </object>
-          <packing>
-            <property name="x">40</property>
-            <property name="y">90</property>
-          </packing>
         </child>
         <child>
           <object class="GtkButton" id="button9">
             <property name="width_request">20</property>
             <property name="height_request">20</property>
-            <property name="visible">True</property>
-            <property name="can_focus">True</property>
-            <property name="receives_default">True</property>
+            <property name="can_focus">1</property>
+            <property name="receives_default">1</property>
             <property name="name">ref</property>
+            <layout>
+              <property name="x">100</property>
+              <property name="y">100</property>
+            </layout>
           </object>
-          <packing>
-            <property name="x">100</property>
-            <property name="y">100</property>
-          </packing>
         </child>
       </object>
     </child>

diff --git a/testsuite/reftests/background-position.ui b/testsuite/reftests/background-position.ui
index 94e088e1a19552cb35655f1402d6822306313590..cfa5cb1c59e8c170655b3d738aa2e9740311d295 100644 (file)
--- a/testsuite/reftests/background-position.ui
+++ b/testsuite/reftests/background-position.ui
@@ -1,158 +1,143 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
-  <!-- interface-requires gtk+ 3.0 -->
   <object class="GtkWindow" id="window1">
-    <property name="can_focus">False</property>
     <property name="type">popup</property>
     <child>
       <object class="GtkGrid" id="grid1">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
-        <property name="row_spacing">0</property>
-        <property name="column_spacing">0</property>
         <child>
           <object class="GtkButton" id="button1">
             <property name="width_request">40</property>
             <property name="height_request">40</property>
-            <property name="visible">True</property>
-            <property name="can_focus">True</property>
-            <property name="receives_default">True</property>
+            <property name="can_focus">1</property>
+            <property name="receives_default">1</property>
             <property name="name">a</property>
+            <layout>
+              <property name="left_attach">0</property>
+              <property name="top_attach">0</property>
+              <property name="column-span">1</property>
+              <property name="row-span">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">0</property>
-            <property name="top_attach">0</property>
-            <property name="width">1</property>
-            <property name="height">1</property>
-          </packing>
         </child>
         <child>
           <object class="GtkButton" id="button2">
             <property name="width_request">40</property>
             <property name="height_request">40</property>
-            <property name="visible">True</property>
-            <property name="can_focus">True</property>
-            <property name="receives_default">True</property>
+            <property name="can_focus">1</property>
+            <property name="receives_default">1</property>
             <property name="name">b</property>
+            <layout>
+              <property name="left_attach">1</property>
+              <property name="top_attach">0</property>
+              <property name="column-span">1</property>
+              <property name="row-span">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">1</property>
-            <property name="top_attach">0</property>
-            <property name="width">1</property>
-            <property name="height">1</property>
-          </packing>
         </child>
         <child>
           <object class="GtkButton" id="button3">
             <property name="width_request">40</property>
             <property name="height_request">40</property>
-            <property name="visible">True</property>
-            <property name="can_focus">True</property>
-            <property name="receives_default">True</property>
+            <property name="can_focus">1</property>
+            <property name="receives_default">1</property>
             <property name="name">c</property>
+            <layout>
+              <property name="left_attach">2</property>
+              <property name="top_attach">0</property>
+              <property name="column-span">1</property>
+              <property name="row-span">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">2</property>
-            <property name="top_attach">0</property>
-            <property name="width">1</property>
-            <property name="height">1</property>
-          </packing>
         </child>
         <child>
           <object class="GtkButton" id="button4">
             <property name="width_request">40</property>
             <property name="height_request">40</property>
-            <property name="visible">True</property>
-            <property name="can_focus">True</property>
-            <property name="receives_default">True</property>
+            <property name="can_focus">1</property>
+            <property name="receives_default">1</property>
             <property name="name">d</property>
+            <layout>
+              <property name="left_attach">0</property>
+              <property name="top_attach">1</property>
+              <property name="column-span">1</property>
+              <property name="row-span">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">0</property>
-            <property name="top_attach">1</property>
-            <property name="width">1</property>
-            <property name="height">1</property>
-          </packing>
         </child>
         <child>
           <object class="GtkButton" id="button5">
             <property name="width_request">40</property>
             <property name="height_request">40</property>
-            <property name="visible">True</property>
-            <property name="can_focus">True</property>
-            <property name="receives_default">True</property>
+            <property name="can_focus">1</property>
+            <property name="receives_default">1</property>
             <property name="name">e</property>
+            <layout>
+              <property name="left_attach">1</property>
+              <property name="top_attach">1</property>
+              <property name="column-span">1</property>
+              <property name="row-span">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">1</property>
-            <property name="top_attach">1</property>
-            <property name="width">1</property>
-            <property name="height">1</property>
-          </packing>
         </child>
         <child>
           <object class="GtkButton" id="button6">
             <property name="width_request">40</property>
             <property name="height_request">40</property>
-            <property name="visible">True</property>
-            <property name="can_focus">True</property>
-            <property name="receives_default">True</property>
+            <property name="can_focus">1</property>
+            <property name="receives_default">1</property>
             <property name="name">f</property>
+            <layout>
+              <property name="left_attach">2</property>
+              <property name="top_attach">1</property>
+              <property name="column-span">1</property>
+              <property name="row-span">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">2</property>
-            <property name="top_attach">1</property>
-            <property name="width">1</property>
-            <property name="height">1</property>
-          </packing>
         </child>
         <child>
           <object class="GtkButton" id="button7">
             <property name="width_request">40</property>
             <property name="height_request">40</property>
-            <property name="visible">True</property>
-            <property name="can_focus">True</property>
-            <property name="receives_default">True</property>
+            <property name="can_focus">1</property>
+            <property name="receives_default">1</property>
             <property name="name">g</property>
+            <layout>
+              <property name="left_attach">0</property>
+              <property name="top_attach">2</property>
+              <property name="column-span">1</property>
+              <property name="row-span">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">0</property>
-            <property name="top_attach">2</property>
-            <property name="width">1</property>
-            <property name="height">1</property>
-          </packing>
         </child>
         <child>
           <object class="GtkButton" id="button8">
             <property name="width_request">40</property>
             <property name="height_request">40</property>
-            <property name="visible">True</property>
-            <property name="can_focus">True</property>
-            <property name="receives_default">True</property>
+            <property name="can_focus">1</property>
+            <property name="receives_default">1</property>
             <property name="name">h</property>
+            <layout>
+              <property name="left_attach">1</property>
+              <property name="top_attach">2</property>
+              <property name="column-span">1</property>
+              <property name="row-span">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">1</property>
-            <property name="top_attach">2</property>
-            <property name="width">1</property>
-            <property name="height">1</property>
-          </packing>
         </child>
         <child>
           <object class="GtkButton" id="button9">
             <property name="width_request">40</property>
             <property name="height_request">40</property>
-            <property name="visible">True</property>
-            <property name="can_focus">True</property>
-            <property name="receives_default">True</property>
+            <property name="can_focus">1</property>
+            <property name="receives_default">1</property>
             <property name="name">i</property>
+            <layout>
+              <property name="left_attach">2</property>
+              <property name="top_attach">2</property>
+              <property name="column-span">1</property>
+              <property name="row-span">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">2</property>
-            <property name="top_attach">2</property>
-            <property name="width">1</property>
-            <property name="height">1</property>
-          </packing>
         </child>
       </object>
     </child>

diff --git a/testsuite/reftests/background-positioning-area-empty.ref.ui b/testsuite/reftests/background-positioning-area-empty.ref.ui
index 7e5c85572e788d12f7e8898939a7d1d922388c70..2367e407d99554e3900fdbb683ed9aa385ffb379 100644 (file)
--- a/testsuite/reftests/background-positioning-area-empty.ref.ui
+++ b/testsuite/reftests/background-positioning-area-empty.ref.ui
@@ -1,14 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
-  <!-- interface-requires gtk+ 3.0 -->
   <object class="GtkWindow" id="window1">
-    <property name="can_focus">False</property>
     <property name="type">popup</property>
     <child>
       <object class="GtkButton" id="button1">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
-        <property name="receives_default">True</property>
+        <property name="receives_default">1</property>
       </object>
     </child>
   </object>

diff --git a/testsuite/reftests/background-positioning-area-empty.ui b/testsuite/reftests/background-positioning-area-empty.ui
index 7e5c85572e788d12f7e8898939a7d1d922388c70..2367e407d99554e3900fdbb683ed9aa385ffb379 100644 (file)
--- a/testsuite/reftests/background-positioning-area-empty.ui
+++ b/testsuite/reftests/background-positioning-area-empty.ui
@@ -1,14 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
-  <!-- interface-requires gtk+ 3.0 -->
   <object class="GtkWindow" id="window1">
-    <property name="can_focus">False</property>
     <property name="type">popup</property>
     <child>
       <object class="GtkButton" id="button1">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
-        <property name="receives_default">True</property>
+        <property name="receives_default">1</property>
       </object>
     </child>
   </object>

diff --git a/testsuite/reftests/background-repeat.ref.ui b/testsuite/reftests/background-repeat.ref.ui
index f719da0ce56113a5133a81d085713d895d79e667..e0bedecf05d6bead1487065d28a1dc92e9d61201 100644 (file)
--- a/testsuite/reftests/background-repeat.ref.ui
+++ b/testsuite/reftests/background-repeat.ref.ui
@@ -1,77 +1,65 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
-  <!-- interface-requires gtk+ 3.0 -->
   <object class="GtkWindow" id="window1">
     <property name="width_request">50</property>
     <property name="height_request">60</property>
-    <property name="can_focus">False</property>
     <property name="type">popup</property>
     <child>
       <object class="GtkGrid" id="grid1">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
         <child>
           <object class="GtkImage" id="image1">
             <property name="width_request">50</property>
             <property name="height_request">60</property>
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="pixbuf">border-image-ball-red.png</property>
+            <layout>
+              <property name="left_attach">0</property>
+              <property name="top_attach">0</property>
+              <property name="column-span">1</property>
+              <property name="row-span">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">0</property>
-            <property name="top_attach">0</property>
-            <property name="width">1</property>
-            <property name="height">1</property>
-          </packing>
         </child>
         <child>
           <object class="GtkImage" id="image2">
             <property name="width_request">20</property>
             <property name="height_request">60</property>
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="pixbuf">border-image-3-balls-green.png</property>
+            <layout>
+              <property name="left_attach">1</property>
+              <property name="top_attach">0</property>
+              <property name="column-span">1</property>
+              <property name="row-span">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">1</property>
-            <property name="top_attach">0</property>
-            <property name="width">1</property>
-            <property name="height">1</property>
-          </packing>
         </child>
         <child>
           <object class="GtkImage" id="image3">
             <property name="width_request">20</property>
             <property name="height_request">60</property>
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="pixbuf">border-image-3-balls-green.png</property>
+            <layout>
+              <property name="left_attach">2</property>
+              <property name="top_attach">0</property>
+              <property name="column-span">1</property>
+              <property name="row-span">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">2</property>
-            <property name="top_attach">0</property>
-            <property name="width">1</property>
-            <property name="height">1</property>
-          </packing>
         </child>
         <child>
           <object class="GtkButton" id="default">
             <property name="name">default-ref</property>
             <property name="width_request">50</property>
             <property name="height_request">60</property>
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <child>
               <placeholder/>
             </child>
+            <layout>
+              <property name="left_attach">3</property>
+              <property name="top_attach">0</property>
+              <property name="column-span">1</property>
+              <property name="row-span">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">3</property>
-            <property name="top_attach">0</property>
-            <property name="width">1</property>
-            <property name="height">1</property>
-          </packing>
         </child>
       </object>
     </child>

diff --git a/testsuite/reftests/background-repeat.ui b/testsuite/reftests/background-repeat.ui
index 8630182ff166bc4fcec3a9091cc580ed43a055a2..dffc4645bd59004e2f9588b726996f1b7f8b4de6 100644 (file)
--- a/testsuite/reftests/background-repeat.ui
+++ b/testsuite/reftests/background-repeat.ui
@@ -1,68 +1,58 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
-  <!-- interface-requires gtk+ 3.0 -->
   <object class="GtkWindow" id="window1">
     <property name="width_request">50</property>
     <property name="height_request">60</property>
-    <property name="can_focus">False</property>
     <property name="type">popup</property>
     <child>
       <object class="GtkGrid" id="grid1">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
         <child>
           <object class="GtkButton" id="no-repeat">
             <property name="name">no-repeat</property>
             <property name="width_request">50</property>
             <property name="height_request">60</property>
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <child>
               <placeholder/>
             </child>
+            <layout>
+              <property name="left_attach">0</property>
+              <property name="top_attach">0</property>
+              <property name="column-span">1</property>
+              <property name="row-span">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">0</property>
-            <property name="top_attach">0</property>
-            <property name="width">1</property>
-            <property name="height">1</property>
-          </packing>
         </child>
         <child>
           <object class="GtkButton" id="repeat">
             <property name="name">repeat</property>
             <property name="width_request">40</property>
             <property name="height_request">60</property>
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <child>
               <placeholder/>
             </child>
+            <layout>
+              <property name="left_attach">1</property>
+              <property name="top_attach">0</property>
+              <property name="column-span">1</property>
+              <property name="row-span">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">1</property>
-            <property name="top_attach">0</property>
-            <property name="width">1</property>
-            <property name="height">1</property>
-          </packing>
         </child>
         <child>
           <object class="GtkButton" id="default">
             <property name="name">default</property>
             <property name="width_request">50</property>
             <property name="height_request">60</property>
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <child>
               <placeholder/>
             </child>
+            <layout>
+              <property name="left_attach">2</property>
+              <property name="top_attach">0</property>
+              <property name="column-span">1</property>
+              <property name="row-span">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">2</property>
-            <property name="top_attach">0</property>
-            <property name="width">1</property>
-            <property name="height">1</property>
-          </packing>
         </child>
       </object>
     </child>

diff --git a/testsuite/reftests/background-size-keywords.ref.ui b/testsuite/reftests/background-size-keywords.ref.ui
index 20294b38a4b72f4ff4b12670ac175ef19985ccba..397398434e954f3e3bbbe22f69de22065490d52f 100644 (file)
--- a/testsuite/reftests/background-size-keywords.ref.ui
+++ b/testsuite/reftests/background-size-keywords.ref.ui
@@ -1,217 +1,201 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
-  <!-- interface-requires gtk+ 3.0 -->
   <object class="GtkWindow" id="window1">
-    <property name="can_focus">False</property>
     <property name="type">popup</property>
     <child>
       <object class="GtkGrid" id="grid1">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
         <property name="name">reference</property>
         <child>
           <object class="GtkButton" id="button1">
             <property name="label" translatable="yes">A</property>
             <property name="width_request">40</property>
             <property name="height_request">30</property>
-            <property name="visible">True</property>
-            <property name="can_focus">True</property>
-            <property name="receives_default">True</property>
+            <property name="can_focus">1</property>
+            <property name="receives_default">1</property>
             <property name="name">a</property>
+            <layout>
+              <property name="left_attach">0</property>
+              <property name="top_attach">0</property>
+              <property name="column-span">1</property>
+              <property name="row-span">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">0</property>
-            <property name="top_attach">0</property>
-            <property name="width">1</property>
-            <property name="height">1</property>
-          </packing>
         </child>
         <child>
           <object class="GtkButton" id="button2">
             <property name="label" translatable="yes">B</property>
             <property name="width_request">40</property>
             <property name="height_request">30</property>
-            <property name="visible">True</property>
-            <property name="can_focus">True</property>
-            <property name="receives_default">True</property>
+            <property name="can_focus">1</property>
+            <property name="receives_default">1</property>
             <property name="name">b</property>
+            <layout>
+              <property name="left_attach">1</property>
+              <property name="top_attach">0</property>
+              <property name="column-span">1</property>
+              <property name="row-span">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">1</property>
-            <property name="top_attach">0</property>
-            <property name="width">1</property>
-            <property name="height">1</property>
-          </packing>
         </child>
         <child>
           <object class="GtkButton" id="button3">
             <property name="label" translatable="yes">C</property>
             <property name="width_request">40</property>
             <property name="height_request">30</property>
-            <property name="visible">True</property>
-            <property name="can_focus">True</property>
-            <property name="receives_default">True</property>
+            <property name="can_focus">1</property>
+            <property name="receives_default">1</property>
             <property name="name">c</property>
+            <layout>
+              <property name="left_attach">2</property>
+              <property name="top_attach">0</property>
+              <property name="column-span">1</property>
+              <property name="row-span">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">2</property>
-            <property name="top_attach">0</property>
-            <property name="width">1</property>
-            <property name="height">1</property>
-          </packing>
         </child>
         <child>
           <object class="GtkButton" id="button4">
             <property name="label" translatable="yes">D</property>
             <property name="width_request">40</property>
             <property name="height_request">30</property>
-            <property name="visible">True</property>
-            <property name="can_focus">True</property>
-            <property name="receives_default">True</property>
+            <property name="can_focus">1</property>
+            <property name="receives_default">1</property>
             <property name="name">d</property>
+            <layout>
+              <property name="left_attach">3</property>
+              <property name="top_attach">0</property>
+              <property name="column-span">1</property>
+              <property name="row-span">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">3</property>
-            <property name="top_attach">0</property>
-            <property name="width">1</property>
-            <property name="height">1</property>
-          </packing>
         </child>
         <child>
           <object class="GtkButton" id="button5">
             <property name="label" translatable="yes">E</property>
             <property name="width_request">40</property>
             <property name="height_request">30</property>
-            <property name="visible">True</property>
-            <property name="can_focus">True</property>
-            <property name="receives_default">True</property>
+            <property name="can_focus">1</property>
+            <property name="receives_default">1</property>
             <property name="name">e</property>
+            <layout>
+              <property name="left_attach">0</property>
+              <property name="top_attach">1</property>
+              <property name="column-span">1</property>
+              <property name="row-span">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">0</property>
-            <property name="top_attach">1</property>
-            <property name="width">1</property>
-            <property name="height">1</property>
-          </packing>
         </child>
         <child>
           <object class="GtkButton" id="button6">
             <property name="label" translatable="yes">F</property>
             <property name="width_request">40</property>
             <property name="height_request">30</property>
-            <property name="visible">True</property>
-            <property name="can_focus">True</property>
-            <property name="receives_default">True</property>
+            <property name="can_focus">1</property>
+            <property name="receives_default">1</property>
             <property name="name">f</property>
+            <layout>
+              <property name="left_attach">1</property>
+              <property name="top_attach">1</property>
+              <property name="column-span">1</property>
+              <property name="row-span">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">1</property>
-            <property name="top_attach">1</property>
-            <property name="width">1</property>
-            <property name="height">1</property>
-          </packing>
         </child>
         <child>
           <object class="GtkButton" id="button7">
             <property name="label" translatable="yes">G</property>
             <property name="width_request">40</property>
             <property name="height_request">30</property>
-            <property name="visible">True</property>
-            <property name="can_focus">True</property>
-            <property name="receives_default">True</property>
+            <property name="can_focus">1</property>
+            <property name="receives_default">1</property>
             <property name="name">g</property>
+            <layout>
+              <property name="left_attach">2</property>
+              <property name="top_attach">1</property>
+              <property name="column-span">1</property>
+              <property name="row-span">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">2</property>
-            <property name="top_attach">1</property>
-            <property name="width">1</property>
-            <property name="height">1</property>
-          </packing>
         </child>
         <child>
           <object class="GtkButton" id="button8">
             <property name="label" translatable="yes">H</property>
             <property name="width_request">40</property>
             <property name="height_request">30</property>
-            <property name="visible">True</property>
-            <property name="can_focus">True</property>
-            <property name="receives_default">True</property>
+            <property name="can_focus">1</property>
+            <property name="receives_default">1</property>
             <property name="name">h</property>
+            <layout>
+              <property name="left_attach">3</property>
+              <property name="top_attach">1</property>
+              <property name="column-span">1</property>
+              <property name="row-span">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">3</property>
-            <property name="top_attach">1</property>
-            <property name="width">1</property>
-            <property name="height">1</property>
-          </packing>
         </child>
         <child>
           <object class="GtkButton" id="button9">
             <property name="label" translatable="yes">I</property>
             <property name="width_request">40</property>
             <property name="height_request">30</property>
-            <property name="visible">True</property>
-            <property name="can_focus">True</property>
-            <property name="receives_default">True</property>
+            <property name="can_focus">1</property>
+            <property name="receives_default">1</property>
             <property name="name">i</property>
+            <layout>
+              <property name="left_attach">0</property>
+              <property name="top_attach">2</property>
+              <property name="column-span">1</property>
+              <property name="row-span">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">0</property>
-            <property name="top_attach">2</property>
-            <property name="width">1</property>
-            <property name="height">1</property>
-          </packing>
         </child>
         <child>
           <object class="GtkButton" id="button10">
             <property name="label" translatable="yes">J</property>
             <property name="width_request">40</property>
             <property name="height_request">30</property>
-            <property name="visible">True</property>
-            <property name="can_focus">True</property>
-            <property name="receives_default">True</property>
+            <property name="can_focus">1</property>
+            <property name="receives_default">1</property>
             <property name="name">j</property>
+            <layout>
+              <property name="left_attach">1</property>
+              <property name="top_attach">2</property>
+              <property name="column-span">1</property>
+              <property name="row-span">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">1</property>
-            <property name="top_attach">2</property>
-            <property name="width">1</property>
-            <property name="height">1</property>
-          </packing>
         </child>
         <child>
           <object class="GtkButton" id="button11">
             <property name="label" translatable="yes">K</property>
             <property name="width_request">40</property>
             <property name="height_request">30</property>
-            <property name="visible">True</property>
-            <property name="can_focus">True</property>
-            <property name="receives_default">True</property>
+            <property name="can_focus">1</property>
+            <property name="receives_default">1</property>
             <property name="name">k</property>
+            <layout>
+              <property name="left_attach">2</property>
+              <property name="top_attach">2</property>
+              <property name="column-span">1</property>
+              <property name="row-span">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">2</property>
-            <property name="top_attach">2</property>
-            <property name="width">1</property>
-            <property name="height">1</property>
-          </packing>
         </child>
         <child>
           <object class="GtkButton" id="button12">
             <property name="label" translatable="yes">L</property>
             <property name="width_request">40</property>
             <property name="height_request">30</property>
-            <property name="visible">True</property>
-            <property name="can_focus">True</property>
-            <property name="receives_default">True</property>
+            <property name="can_focus">1</property>
+            <property name="receives_default">1</property>
             <property name="name">l</property>
+            <layout>
+              <property name="left_attach">3</property>
+              <property name="top_attach">2</property>
+              <property name="column-span">1</property>
+              <property name="row-span">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">3</property>
-            <property name="top_attach">2</property>
-            <property name="width">1</property>
-            <property name="height">1</property>
-          </packing>
         </child>
       </object>
     </child>

diff --git a/testsuite/reftests/background-size-keywords.ui b/testsuite/reftests/background-size-keywords.ui
index 71c48676cd65b96c8a2d7e620e48956af92f43fe..d6acd4e05e7bb7bf5d4555bc6290f102f5a175bb 100644 (file)
--- a/testsuite/reftests/background-size-keywords.ui
+++ b/testsuite/reftests/background-size-keywords.ui
@@ -1,216 +1,200 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
-  <!-- interface-requires gtk+ 3.0 -->
   <object class="GtkWindow" id="window1">
-    <property name="can_focus">False</property>
     <property name="type">popup</property>
     <child>
       <object class="GtkGrid" id="grid1">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
         <child>
           <object class="GtkButton" id="button1">
             <property name="label" translatable="yes">A</property>
             <property name="width_request">40</property>
             <property name="height_request">30</property>
-            <property name="visible">True</property>
-            <property name="can_focus">True</property>
-            <property name="receives_default">True</property>
+            <property name="can_focus">1</property>
+            <property name="receives_default">1</property>
             <property name="name">a</property>
+            <layout>
+              <property name="left_attach">0</property>
+              <property name="top_attach">0</property>
+              <property name="column-span">1</property>
+              <property name="row-span">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">0</property>
-            <property name="top_attach">0</property>
-            <property name="width">1</property>
-            <property name="height">1</property>
-          </packing>
         </child>
         <child>
           <object class="GtkButton" id="button2">
             <property name="label" translatable="yes">B</property>
             <property name="width_request">40</property>
             <property name="height_request">30</property>
-            <property name="visible">True</property>
-            <property name="can_focus">True</property>
-            <property name="receives_default">True</property>
+            <property name="can_focus">1</property>
+            <property name="receives_default">1</property>
             <property name="name">b</property>
+            <layout>
+              <property name="left_attach">1</property>
+              <property name="top_attach">0</property>
+              <property name="column-span">1</property>
+              <property name="row-span">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">1</property>
-            <property name="top_attach">0</property>
-            <property name="width">1</property>
-            <property name="height">1</property>
-          </packing>
         </child>
         <child>
           <object class="GtkButton" id="button3">
             <property name="label" translatable="yes">C</property>
             <property name="width_request">40</property>
             <property name="height_request">30</property>
-            <property name="visible">True</property>
-            <property name="can_focus">True</property>
-            <property name="receives_default">True</property>
+            <property name="can_focus">1</property>
+            <property name="receives_default">1</property>
             <property name="name">c</property>
+            <layout>
+              <property name="left_attach">2</property>
+              <property name="top_attach">0</property>
+              <property name="column-span">1</property>
+              <property name="row-span">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">2</property>
-            <property name="top_attach">0</property>
-            <property name="width">1</property>
-            <property name="height">1</property>
-          </packing>
         </child>
         <child>
           <object class="GtkButton" id="button4">
             <property name="label" translatable="yes">D</property>
             <property name="width_request">40</property>
             <property name="height_request">30</property>
-            <property name="visible">True</property>
-            <property name="can_focus">True</property>
-            <property name="receives_default">True</property>
+            <property name="can_focus">1</property>
+            <property name="receives_default">1</property>
             <property name="name">d</property>
+            <layout>
+              <property name="left_attach">3</property>
+              <property name="top_attach">0</property>
+              <property name="column-span">1</property>
+              <property name="row-span">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">3</property>
-            <property name="top_attach">0</property>
-            <property name="width">1</property>
-            <property name="height">1</property>
-          </packing>
         </child>
         <child>
           <object class="GtkButton" id="button5">
             <property name="label" translatable="yes">E</property>
             <property name="width_request">40</property>
             <property name="height_request">30</property>
-            <property name="visible">True</property>
-            <property name="can_focus">True</property>
-            <property name="receives_default">True</property>
+            <property name="can_focus">1</property>
+            <property name="receives_default">1</property>
             <property name="name">e</property>
+            <layout>
+              <property name="left_attach">0</property>
+              <property name="top_attach">1</property>
+              <property name="column-span">1</property>
+              <property name="row-span">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">0</property>
-            <property name="top_attach">1</property>
-            <property name="width">1</property>
-            <property name="height">1</property>
-          </packing>
         </child>
         <child>
           <object class="GtkButton" id="button6">
             <property name="label" translatable="yes">F</property>
             <property name="width_request">40</property>
             <property name="height_request">30</property>
-            <property name="visible">True</property>
-            <property name="can_focus">True</property>
-            <property name="receives_default">True</property>
+            <property name="can_focus">1</property>
+            <property name="receives_default">1</property>
             <property name="name">f</property>
+            <layout>
+              <property name="left_attach">1</property>
+              <property name="top_attach">1</property>
+              <property name="column-span">1</property>
+              <property name="row-span">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">1</property>
-            <property name="top_attach">1</property>
-            <property name="width">1</property>
-            <property name="height">1</property>
-          </packing>
         </child>
         <child>
           <object class="GtkButton" id="button7">
             <property name="label" translatable="yes">G</property>
             <property name="width_request">40</property>
             <property name="height_request">30</property>
-            <property name="visible">True</property>
-            <property name="can_focus">True</property>
-            <property name="receives_default">True</property>
+            <property name="can_focus">1</property>
+            <property name="receives_default">1</property>
             <property name="name">g</property>
+            <layout>
+              <property name="left_attach">2</property>
+              <property name="top_attach">1</property>
+              <property name="column-span">1</property>
+              <property name="row-span">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">2</property>
-            <property name="top_attach">1</property>
-            <property name="width">1</property>
-            <property name="height">1</property>
-          </packing>
         </child>
         <child>
           <object class="GtkButton" id="button8">
             <property name="label" translatable="yes">H</property>
             <property name="width_request">40</property>
             <property name="height_request">30</property>
-            <property name="visible">True</property>
-            <property name="can_focus">True</property>
-            <property name="receives_default">True</property>
+            <property name="can_focus">1</property>
+            <property name="receives_default">1</property>
             <property name="name">h</property>
+            <layout>
+              <property name="left_attach">3</property>
+              <property name="top_attach">1</property>
+              <property name="column-span">1</property>
+              <property name="row-span">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">3</property>
-            <property name="top_attach">1</property>
-            <property name="width">1</property>
-            <property name="height">1</property>
-          </packing>
         </child>
         <child>
           <object class="GtkButton" id="button9">
             <property name="label" translatable="yes">I</property>
             <property name="width_request">40</property>
             <property name="height_request">30</property>
-            <property name="visible">True</property>
-            <property name="can_focus">True</property>
-            <property name="receives_default">True</property>
+            <property name="can_focus">1</property>
+            <property name="receives_default">1</property>
             <property name="name">i</property>
+            <layout>
+              <property name="left_attach">0</property>
+              <property name="top_attach">2</property>
+              <property name="column-span">1</property>
+              <property name="row-span">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">0</property>
-            <property name="top_attach">2</property>
-            <property name="width">1</property>
-            <property name="height">1</property>
-          </packing>
         </child>
         <child>
           <object class="GtkButton" id="button10">
             <property name="label" translatable="yes">J</property>
             <property name="width_request">40</property>
             <property name="height_request">30</property>
-            <property name="visible">True</property>
-            <property name="can_focus">True</property>
-            <property name="receives_default">True</property>
+            <property name="can_focus">1</property>
+            <property name="receives_default">1</property>
             <property name="name">j</property>
+            <layout>
+              <property name="left_attach">1</property>
+              <property name="top_attach">2</property>
+              <property name="column-span">1</property>
+              <property name="row-span">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">1</property>
-            <property name="top_attach">2</property>
-            <property name="width">1</property>
-            <property name="height">1</property>
-          </packing>
         </child>
         <child>
           <object class="GtkButton" id="button11">
             <property name="label" translatable="yes">K</property>
             <property name="width_request">40</property>
             <property name="height_request">30</property>
-            <property name="visible">True</property>
-            <property name="can_focus">True</property>
-            <property name="receives_default">True</property>
+            <property name="can_focus">1</property>
+            <property name="receives_default">1</property>
             <property name="name">k</property>
+            <layout>
+              <property name="left_attach">2</property>
+              <property name="top_attach">2</property>
+              <property name="column-span">1</property>
+              <property name="row-span">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">2</property>
-            <property name="top_attach">2</property>
-            <property name="width">1</property>
-            <property name="height">1</property>
-          </packing>
         </child>
         <child>
           <object class="GtkButton" id="button12">
             <property name="label" translatable="yes">L</property>
             <property name="width_request">40</property>
             <property name="height_request">30</property>
-            <property name="visible">True</property>
-            <property name="can_focus">True</property>
-            <property name="receives_default">True</property>
+            <property name="can_focus">1</property>
+            <property name="receives_default">1</property>
             <property name="name">l</property>
+            <layout>
+              <property name="left_attach">3</property>
+              <property name="top_attach">2</property>
+              <property name="column-span">1</property>
+              <property name="row-span">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">3</property>
-            <property name="top_attach">2</property>
-            <property name="width">1</property>
-            <property name="height">1</property>
-          </packing>
         </child>
       </object>
     </child>

diff --git a/testsuite/reftests/background-size-zero.ref.ui b/testsuite/reftests/background-size-zero.ref.ui
index 9d475c3aaa37f92e03bb5b82e90c2447dd2b2b2f..5cb0e82ca66e1c2a73347d9f040a99c8c204b455 100644 (file)
--- a/testsuite/reftests/background-size-zero.ref.ui
+++ b/testsuite/reftests/background-size-zero.ref.ui
@@ -1,8 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
-  <!-- interface-requires gtk+ 3.0 -->
   <object class="GtkWindow" id="window1">
-    <property name="can_focus">False</property>
     <property name="type">popup</property>
     <property name="name">reference</property>
     <child>

diff --git a/testsuite/reftests/background-size-zero.ui b/testsuite/reftests/background-size-zero.ui
index 51595c789484dd43447aff79b36305030a89ace8..ec70764dc34cb9ff331912fa538102cff3299070 100644 (file)
--- a/testsuite/reftests/background-size-zero.ui
+++ b/testsuite/reftests/background-size-zero.ui
@@ -1,8 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
-  <!-- interface-requires gtk+ 3.0 -->
   <object class="GtkWindow" id="window1">
-    <property name="can_focus">False</property>
     <property name="type">popup</property>
     <child>
       <placeholder/>

diff --git a/testsuite/reftests/background-size.ref.ui b/testsuite/reftests/background-size.ref.ui
index 2a2374a1590201201c641b232fb4065ab7a8cdbe..3fe2e2f29e8ceca95e897a63a0e2a4143e7fe3f6 100644 (file)
--- a/testsuite/reftests/background-size.ref.ui
+++ b/testsuite/reftests/background-size.ref.ui
@@ -1,217 +1,201 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
-  <!-- interface-requires gtk+ 3.0 -->
   <object class="GtkWindow" id="window1">
-    <property name="can_focus">False</property>
     <property name="type">popup</property>
     <child>
       <object class="GtkGrid" id="grid1">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
         <property name="name">reference</property>
         <child>
           <object class="GtkButton" id="button1">
             <property name="label" translatable="yes">A</property>
             <property name="width_request">40</property>
             <property name="height_request">40</property>
-            <property name="visible">True</property>
-            <property name="can_focus">True</property>
-            <property name="receives_default">True</property>
+            <property name="can_focus">1</property>
+            <property name="receives_default">1</property>
             <property name="name">a</property>
+            <layout>
+              <property name="left_attach">0</property>
+              <property name="top_attach">0</property>
+              <property name="column-span">1</property>
+              <property name="row-span">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">0</property>
-            <property name="top_attach">0</property>
-            <property name="width">1</property>
-            <property name="height">1</property>
-          </packing>
         </child>
         <child>
           <object class="GtkButton" id="button2">
             <property name="label" translatable="yes">B</property>
             <property name="width_request">40</property>
             <property name="height_request">40</property>
-            <property name="visible">True</property>
-            <property name="can_focus">True</property>
-            <property name="receives_default">True</property>
+            <property name="can_focus">1</property>
+            <property name="receives_default">1</property>
             <property name="name">b</property>
+            <layout>
+              <property name="left_attach">1</property>
+              <property name="top_attach">0</property>
+              <property name="column-span">1</property>
+              <property name="row-span">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">1</property>
-            <property name="top_attach">0</property>
-            <property name="width">1</property>
-            <property name="height">1</property>
-          </packing>
         </child>
         <child>
           <object class="GtkButton" id="button3">
             <property name="label" translatable="yes">C</property>
             <property name="width_request">40</property>
             <property name="height_request">40</property>
-            <property name="visible">True</property>
-            <property name="can_focus">True</property>
-            <property name="receives_default">True</property>
+            <property name="can_focus">1</property>
+            <property name="receives_default">1</property>
             <property name="name">c</property>
+            <layout>
+              <property name="left_attach">2</property>
+              <property name="top_attach">0</property>
+              <property name="column-span">1</property>
+              <property name="row-span">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">2</property>
-            <property name="top_attach">0</property>
-            <property name="width">1</property>
-            <property name="height">1</property>
-          </packing>
         </child>
         <child>
           <object class="GtkButton" id="button4">
             <property name="label" translatable="yes">D</property>
             <property name="width_request">40</property>
             <property name="height_request">40</property>
-            <property name="visible">True</property>
-            <property name="can_focus">True</property>
-            <property name="receives_default">True</property>
+            <property name="can_focus">1</property>
+            <property name="receives_default">1</property>
             <property name="name">d</property>
+            <layout>
+              <property name="left_attach">3</property>
+              <property name="top_attach">0</property>
+              <property name="column-span">1</property>
+              <property name="row-span">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">3</property>
-            <property name="top_attach">0</property>
-            <property name="width">1</property>
-            <property name="height">1</property>
-          </packing>
         </child>
         <child>
           <object class="GtkButton" id="button5">
             <property name="label" translatable="yes">E</property>
             <property name="width_request">40</property>
             <property name="height_request">40</property>
-            <property name="visible">True</property>
-            <property name="can_focus">True</property>
-            <property name="receives_default">True</property>
+            <property name="can_focus">1</property>
+            <property name="receives_default">1</property>
             <property name="name">e</property>
+            <layout>
+              <property name="left_attach">0</property>
+              <property name="top_attach">1</property>
+              <property name="column-span">1</property>
+              <property name="row-span">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">0</property>
-            <property name="top_attach">1</property>
-            <property name="width">1</property>
-            <property name="height">1</property>
-          </packing>
         </child>
         <child>
           <object class="GtkButton" id="button6">
             <property name="label" translatable="yes">F</property>
             <property name="width_request">40</property>
             <property name="height_request">40</property>
-            <property name="visible">True</property>
-            <property name="can_focus">True</property>
-            <property name="receives_default">True</property>
+            <property name="can_focus">1</property>
+            <property name="receives_default">1</property>
             <property name="name">f</property>
+            <layout>
+              <property name="left_attach">1</property>
+              <property name="top_attach">1</property>
+              <property name="column-span">1</property>
+              <property name="row-span">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">1</property>
-            <property name="top_attach">1</property>
-            <property name="width">1</property>
-            <property name="height">1</property>
-          </packing>
         </child>
         <child>
           <object class="GtkButton" id="button7">
             <property name="label" translatable="yes">G</property>
             <property name="width_request">40</property>
             <property name="height_request">40</property>
-            <property name="visible">True</property>
-            <property name="can_focus">True</property>
-            <property name="receives_default">True</property>
+            <property name="can_focus">1</property>
+            <property name="receives_default">1</property>
             <property name="name">g</property>
+            <layout>
+              <property name="left_attach">2</property>
+              <property name="top_attach">1</property>
+              <property name="column-span">1</property>
+              <property name="row-span">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">2</property>
-            <property name="top_attach">1</property>
-            <property name="width">1</property>
-            <property name="height">1</property>
-          </packing>
         </child>
         <child>
           <object class="GtkButton" id="button8">
             <property name="label" translatable="yes">H</property>
             <property name="width_request">40</property>
             <property name="height_request">40</property>
-            <property name="visible">True</property>
-            <property name="can_focus">True</property>
-            <property name="receives_default">True</property>
+            <property name="can_focus">1</property>
+            <property name="receives_default">1</property>
             <property name="name">h</property>
+            <layout>
+              <property name="left_attach">3</property>
+              <property name="top_attach">1</property>
+              <property name="column-span">1</property>
+              <property name="row-span">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">3</property>
-            <property name="top_attach">1</property>
-            <property name="width">1</property>
-            <property name="height">1</property>
-          </packing>
         </child>
         <child>
           <object class="GtkButton" id="button9">
             <property name="label" translatable="yes">I</property>
             <property name="width_request">40</property>
             <property name="height_request">40</property>
-            <property name="visible">True</property>
-            <property name="can_focus">True</property>
-            <property name="receives_default">True</property>
+            <property name="can_focus">1</property>
+            <property name="receives_default">1</property>
             <property name="name">i</property>
+            <layout>
+              <property name="left_attach">0</property>
+              <property name="top_attach">2</property>
+              <property name="column-span">1</property>
+              <property name="row-span">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">0</property>
-            <property name="top_attach">2</property>
-            <property name="width">1</property>
-            <property name="height">1</property>
-          </packing>
         </child>
         <child>
           <object class="GtkButton" id="button10">
             <property name="label" translatable="yes">J</property>
             <property name="width_request">40</property>
             <property name="height_request">40</property>
-            <property name="visible">True</property>
-            <property name="can_focus">True</property>
-            <property name="receives_default">True</property>
+            <property name="can_focus">1</property>
+            <property name="receives_default">1</property>
             <property name="name">j</property>
+            <layout>
+              <property name="left_attach">1</property>
+              <property name="top_attach">2</property>
+              <property name="column-span">1</property>
+              <property name="row-span">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">1</property>
-            <property name="top_attach">2</property>
-            <property name="width">1</property>
-            <property name="height">1</property>
-          </packing>
         </child>
         <child>
           <object class="GtkButton" id="button11">
             <property name="label" translatable="yes">K</property>
             <property name="width_request">40</property>
             <property name="height_request">40</property>
-            <property name="visible">True</property>
-            <property name="can_focus">True</property>
-            <property name="receives_default">True</property>
+            <property name="can_focus">1</property>
+            <property name="receives_default">1</property>
             <property name="name">k</property>
+            <layout>
+              <property name="left_attach">2</property>
+              <property name="top_attach">2</property>
+              <property name="column-span">1</property>
+              <property name="row-span">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">2</property>
-            <property name="top_attach">2</property>
-            <property name="width">1</property>
-            <property name="height">1</property>
-          </packing>
         </child>
         <child>
           <object class="GtkButton" id="button12">
             <property name="label" translatable="yes">L</property>
             <property name="width_request">40</property>
             <property name="height_request">40</property>
-            <property name="visible">True</property>
-            <property name="can_focus">True</property>
-            <property name="receives_default">True</property>
+            <property name="can_focus">1</property>
+            <property name="receives_default">1</property>
             <property name="name">l</property>
+            <layout>
+              <property name="left_attach">3</property>
+              <property name="top_attach">2</property>
+              <property name="column-span">1</property>
+              <property name="row-span">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">3</property>
-            <property name="top_attach">2</property>
-            <property name="width">1</property>
-            <property name="height">1</property>
-          </packing>
         </child>
       </object>
     </child>

diff --git a/testsuite/reftests/background-size.ui b/testsuite/reftests/background-size.ui
index 1de12199720eaa3c10c351f7939da6d41adff4ad..5fd91c028cf9091ef380a8451e07bfdb396d42d6 100644 (file)
--- a/testsuite/reftests/background-size.ui
+++ b/testsuite/reftests/background-size.ui
@@ -1,216 +1,200 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
-  <!-- interface-requires gtk+ 3.0 -->
   <object class="GtkWindow" id="window1">
-    <property name="can_focus">False</property>
     <property name="type">popup</property>
     <child>
       <object class="GtkGrid" id="grid1">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
         <child>
           <object class="GtkButton" id="button1">
             <property name="label" translatable="yes">A</property>
             <property name="width_request">40</property>
             <property name="height_request">40</property>
-            <property name="visible">True</property>
-            <property name="can_focus">True</property>
-            <property name="receives_default">True</property>
+            <property name="can_focus">1</property>
+            <property name="receives_default">1</property>
             <property name="name">a</property>
+            <layout>
+              <property name="left_attach">0</property>
+              <property name="top_attach">0</property>
+              <property name="column-span">1</property>
+              <property name="row-span">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">0</property>
-            <property name="top_attach">0</property>
-            <property name="width">1</property>
-            <property name="height">1</property>
-          </packing>
         </child>
         <child>
           <object class="GtkButton" id="button2">
             <property name="label" translatable="yes">B</property>
             <property name="width_request">40</property>
             <property name="height_request">40</property>
-            <property name="visible">True</property>
-            <property name="can_focus">True</property>
-            <property name="receives_default">True</property>
+            <property name="can_focus">1</property>
+            <property name="receives_default">1</property>
             <property name="name">b</property>
+            <layout>
+              <property name="left_attach">1</property>
+              <property name="top_attach">0</property>
+              <property name="column-span">1</property>
+              <property name="row-span">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">1</property>
-            <property name="top_attach">0</property>
-            <property name="width">1</property>
-            <property name="height">1</property>
-          </packing>
         </child>
         <child>
           <object class="GtkButton" id="button3">
             <property name="label" translatable="yes">C</property>
             <property name="width_request">40</property>
             <property name="height_request">40</property>
-            <property name="visible">True</property>
-            <property name="can_focus">True</property>
-            <property name="receives_default">True</property>
+            <property name="can_focus">1</property>
+            <property name="receives_default">1</property>
             <property name="name">c</property>
+            <layout>
+              <property name="left_attach">2</property>
+              <property name="top_attach">0</property>
+              <property name="column-span">1</property>
+              <property name="row-span">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">2</property>
-            <property name="top_attach">0</property>
-            <property name="width">1</property>
-            <property name="height">1</property>
-          </packing>
         </child>
         <child>
           <object class="GtkButton" id="button4">
             <property name="label" translatable="yes">D</property>
             <property name="width_request">40</property>
             <property name="height_request">40</property>
-            <property name="visible">True</property>
-            <property name="can_focus">True</property>
-            <property name="receives_default">True</property>
+            <property name="can_focus">1</property>
+            <property name="receives_default">1</property>
             <property name="name">d</property>
+            <layout>
+              <property name="left_attach">3</property>
+              <property name="top_attach">0</property>
+              <property name="column-span">1</property>
+              <property name="row-span">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">3</property>
-            <property name="top_attach">0</property>
-            <property name="width">1</property>
-            <property name="height">1</property>
-          </packing>
         </child>
         <child>
           <object class="GtkButton" id="button5">
             <property name="label" translatable="yes">E</property>
             <property name="width_request">40</property>
             <property name="height_request">40</property>
-            <property name="visible">True</property>
-            <property name="can_focus">True</property>
-            <property name="receives_default">True</property>
+            <property name="can_focus">1</property>
+            <property name="receives_default">1</property>
             <property name="name">e</property>
+            <layout>
+              <property name="left_attach">0</property>
+              <property name="top_attach">1</property>
+              <property name="column-span">1</property>
+              <property name="row-span">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">0</property>
-            <property name="top_attach">1</property>
-            <property name="width">1</property>
-            <property name="height">1</property>
-          </packing>
         </child>
         <child>
           <object class="GtkButton" id="button6">
             <property name="label" translatable="yes">F</property>
             <property name="width_request">40</property>
             <property name="height_request">40</property>
-            <property name="visible">True</property>
-            <property name="can_focus">True</property>
-            <property name="receives_default">True</property>
+            <property name="can_focus">1</property>
+            <property name="receives_default">1</property>
             <property name="name">f</property>
+            <layout>
+              <property name="left_attach">1</property>
+              <property name="top_attach">1</property>
+              <property name="column-span">1</property>
+              <property name="row-span">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">1</property>
-            <property name="top_attach">1</property>
-            <property name="width">1</property>
-            <property name="height">1</property>
-          </packing>
         </child>
         <child>
           <object class="GtkButton" id="button7">
             <property name="label" translatable="yes">G</property>
             <property name="width_request">40</property>
             <property name="height_request">40</property>
-            <property name="visible">True</property>
-            <property name="can_focus">True</property>
-            <property name="receives_default">True</property>
+            <property name="can_focus">1</property>
+            <property name="receives_default">1</property>
             <property name="name">g</property>
+            <layout>
+              <property name="left_attach">2</property>
+              <property name="top_attach">1</property>
+              <property name="column-span">1</property>
+              <property name="row-span">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">2</property>
-            <property name="top_attach">1</property>
-            <property name="width">1</property>
-            <property name="height">1</property>
-          </packing>
         </child>
         <child>
           <object class="GtkButton" id="button8">
             <property name="label" translatable="yes">H</property>
             <property name="width_request">40</property>
             <property name="height_request">40</property>
-            <property name="visible">True</property>
-            <property name="can_focus">True</property>
-            <property name="receives_default">True</property>
+            <property name="can_focus">1</property>
+            <property name="receives_default">1</property>
             <property name="name">h</property>
+            <layout>
+              <property name="left_attach">3</property>
+              <property name="top_attach">1</property>
+              <property name="column-span">1</property>
+              <property name="row-span">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">3</property>
-            <property name="top_attach">1</property>
-            <property name="width">1</property>
-            <property name="height">1</property>
-          </packing>
         </child>
         <child>
           <object class="GtkButton" id="button9">
             <property name="label" translatable="yes">I</property>
             <property name="width_request">40</property>
             <property name="height_request">40</property>
-            <property name="visible">True</property>
-            <property name="can_focus">True</property>
-            <property name="receives_default">True</property>
+            <property name="can_focus">1</property>
+            <property name="receives_default">1</property>
             <property name="name">i</property>
+            <layout>
+              <property name="left_attach">0</property>
+              <property name="top_attach">2</property>
+              <property name="column-span">1</property>
+              <property name="row-span">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">0</property>
-            <property name="top_attach">2</property>
-            <property name="width">1</property>
-            <property name="height">1</property>
-          </packing>
         </child>
         <child>
           <object class="GtkButton" id="button10">
             <property name="label" translatable="yes">J</property>
             <property name="width_request">40</property>
             <property name="height_request">40</property>
-            <property name="visible">True</property>
-            <property name="can_focus">True</property>
-            <property name="receives_default">True</property>
+            <property name="can_focus">1</property>
+            <property name="receives_default">1</property>
             <property name="name">j</property>
+            <layout>
+              <property name="left_attach">1</property>
+              <property name="top_attach">2</property>
+              <property name="column-span">1</property>
+              <property name="row-span">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">1</property>
-            <property name="top_attach">2</property>
-            <property name="width">1</property>
-            <property name="height">1</property>
-          </packing>
         </child>
         <child>
           <object class="GtkButton" id="button11">
             <property name="label" translatable="yes">K</property>
             <property name="width_request">40</property>
             <property name="height_request">40</property>
-            <property name="visible">True</property>
-            <property name="can_focus">True</property>
-            <property name="receives_default">True</property>
+            <property name="can_focus">1</property>
+            <property name="receives_default">1</property>
             <property name="name">k</property>
+            <layout>
+              <property name="left_attach">2</property>
+              <property name="top_attach">2</property>
+              <property name="column-span">1</property>
+              <property name="row-span">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">2</property>
-            <property name="top_attach">2</property>
-            <property name="width">1</property>
-            <property name="height">1</property>
-          </packing>
         </child>
         <child>
           <object class="GtkButton" id="button12">
             <property name="label" translatable="yes">L</property>
             <property name="width_request">40</property>
             <property name="height_request">40</property>
-            <property name="visible">True</property>
-            <property name="can_focus">True</property>
-            <property name="receives_default">True</property>
+            <property name="can_focus">1</property>
+            <property name="receives_default">1</property>
             <property name="name">l</property>
+            <layout>
+              <property name="left_attach">3</property>
+              <property name="top_attach">2</property>
+              <property name="column-span">1</property>
+              <property name="row-span">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">3</property>
-            <property name="top_attach">2</property>
-            <property name="width">1</property>
-            <property name="height">1</property>
-          </packing>
         </child>
       </object>
     </child>

diff --git a/testsuite/reftests/background-window-transparent.ref.ui b/testsuite/reftests/background-window-transparent.ref.ui
index 368cd75cb5e69362c5eb0bedf1c8d8aa1e9272a6..62011eb05cfc3a9319e2c92b874205d6b53ccb91 100644 (file)
--- a/testsuite/reftests/background-window-transparent.ref.ui
+++ b/testsuite/reftests/background-window-transparent.ref.ui
@@ -1,14 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
-  <!-- interface-requires gtk+ 3.0 -->
   <object class="GtkWindow" id="window1">
-    <property name="can_focus">False</property>
     <property name="type">popup</property>
     <property name="name">reference</property>
     <child>
       <object class="GtkViewport" id="viewport1">
-        <property name="visible">True</property>
-        <property name="can_focus">True</property>
+        <property name="can_focus">1</property>
       </object>
     </child>
   </object>

diff --git a/testsuite/reftests/background-window-transparent.ui b/testsuite/reftests/background-window-transparent.ui
index be902b7bdba0bd82d54fc305a3e13ed90d8b3e24..9b4f1d07ed3af04fff272e9e225ae15a49bff927 100644 (file)
--- a/testsuite/reftests/background-window-transparent.ui
+++ b/testsuite/reftests/background-window-transparent.ui
@@ -1,13 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
-  <!-- interface-requires gtk+ 3.0 -->
   <object class="GtkWindow" id="window1">
-    <property name="can_focus">False</property>
     <property name="type">popup</property>
     <child>
       <object class="GtkViewport" id="viewport1">
-        <property name="visible">True</property>
-        <property name="can_focus">True</property>
+        <property name="can_focus">1</property>
       </object>
     </child>
   </object>

diff --git a/testsuite/reftests/bad-color-names.ref.ui b/testsuite/reftests/bad-color-names.ref.ui
index 5cb9f67be15bf6fc7b3beba5e565aeff4d2195aa..297844bb362c0ca4d753f1323035468aec3fadc0 100644 (file)
--- a/testsuite/reftests/bad-color-names.ref.ui
+++ b/testsuite/reftests/bad-color-names.ref.ui
@@ -1,10 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
-  <!-- interface-requires gtk+ 3.0 -->
   <object class="GtkWindow" id="window1">
     <property name="width_request">10</property>
     <property name="height_request">10</property>
-    <property name="can_focus">False</property>
     <property name="type">popup</property>
   </object>
 </interface>

diff --git a/testsuite/reftests/bad-color-names.ui b/testsuite/reftests/bad-color-names.ui
index 5cb9f67be15bf6fc7b3beba5e565aeff4d2195aa..297844bb362c0ca4d753f1323035468aec3fadc0 100644 (file)
--- a/testsuite/reftests/bad-color-names.ui
+++ b/testsuite/reftests/bad-color-names.ui
@@ -1,10 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
-  <!-- interface-requires gtk+ 3.0 -->
   <object class="GtkWindow" id="window1">
     <property name="width_request">10</property>
     <property name="height_request">10</property>
-    <property name="can_focus">False</property>
     <property name="type">popup</property>
   </object>
 </interface>

diff --git a/testsuite/reftests/border-color-default.ref.ui b/testsuite/reftests/border-color-default.ref.ui
index c6aa81d1ce82174751ec78caa01e91a34d784bec..c4e75901a2de8bb5f2cabda381394de1687c77c7 100644 (file)
--- a/testsuite/reftests/border-color-default.ref.ui
+++ b/testsuite/reftests/border-color-default.ref.ui
@@ -1,15 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
-  <!-- interface-requires gtk+ 3.0 -->
   <object class="GtkWindow" id="window1">
-    <property name="can_focus">False</property>
     <property name="type">popup</property>
     <child>
       <object class="GtkButton" id="button1">
         <property name="name">reference</property>
-        <property name="visible">True</property>
-        <property name="can_focus">True</property>
-        <property name="receives_default">True</property>
+        <property name="can_focus">1</property>
+        <property name="receives_default">1</property>
       </object>
     </child>
   </object>

diff --git a/testsuite/reftests/border-color-default.ui b/testsuite/reftests/border-color-default.ui
index 248cd28c0b24200262c701d0ce586e6c7b0fb787..5171539c74f620659415a49770cbf2aed06720e0 100644 (file)
--- a/testsuite/reftests/border-color-default.ui
+++ b/testsuite/reftests/border-color-default.ui
@@ -1,14 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
-  <!-- interface-requires gtk+ 3.0 -->
   <object class="GtkWindow" id="window1">
-    <property name="can_focus">False</property>
     <property name="type">popup</property>
     <child>
       <object class="GtkButton" id="button1">
-        <property name="visible">True</property>
-        <property name="can_focus">True</property>
-        <property name="receives_default">True</property>
+        <property name="can_focus">1</property>
+        <property name="receives_default">1</property>
       </object>
     </child>
   </object>

diff --git a/testsuite/reftests/border-corner-zero-width-rendering.ref.ui b/testsuite/reftests/border-corner-zero-width-rendering.ref.ui
index 16ccad538e8725f73f8b59fdea718678d9880e09..df0ac760ae94d3f100529c2cc0f491de0cf99397 100644 (file)
--- a/testsuite/reftests/border-corner-zero-width-rendering.ref.ui
+++ b/testsuite/reftests/border-corner-zero-width-rendering.ref.ui
@@ -1,205 +1,185 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!-- Generated with glade 3.18.3 -->
 <interface>
   <requires lib="gtk+" version="3.12"/>
   <object class="GtkWindow" id="window1">
-    <property name="can_focus">False</property>
     <property name="type">popup</property>
     <child>
       <object class="GtkGrid" id="grid1">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
         <child>
           <object class="GtkButton" id="button1">
             <property name="label" translatable="yes">button</property>
-            <property name="visible">True</property>
-            <property name="can_focus">True</property>
-            <property name="receives_default">True</property>
+            <property name="can_focus">1</property>
+            <property name="receives_default">1</property>
+            <layout>
+              <property name="left_attach">0</property>
+              <property name="top_attach">0</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">0</property>
-            <property name="top_attach">0</property>
-          </packing>
         </child>
         <child>
           <object class="GtkButton" id="button2">
             <property name="label" translatable="yes">button</property>
-            <property name="visible">True</property>
-            <property name="can_focus">True</property>
-            <property name="receives_default">True</property>
+            <property name="can_focus">1</property>
+            <property name="receives_default">1</property>
+            <layout>
+              <property name="left_attach">0</property>
+              <property name="top_attach">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">0</property>
-            <property name="top_attach">1</property>
-          </packing>
         </child>
         <child>
           <object class="GtkButton" id="button3">
             <property name="label" translatable="yes">button</property>
-            <property name="visible">True</property>
-            <property name="can_focus">True</property>
-            <property name="receives_default">True</property>
+            <property name="can_focus">1</property>
+            <property name="receives_default">1</property>
+            <layout>
+              <property name="left_attach">0</property>
+              <property name="top_attach">3</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">0</property>
-            <property name="top_attach">3</property>
-          </packing>
         </child>
         <child>
           <object class="GtkButton" id="button4">
             <property name="label" translatable="yes">button</property>
-            <property name="visible">True</property>
-            <property name="can_focus">True</property>
-            <property name="receives_default">True</property>
+            <property name="can_focus">1</property>
+            <property name="receives_default">1</property>
+            <layout>
+              <property name="left_attach">0</property>
+              <property name="top_attach">2</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">0</property>
-            <property name="top_attach">2</property>
-          </packing>
         </child>
         <child>
           <object class="GtkButton" id="button5">
             <property name="label" translatable="yes">button</property>
-            <property name="visible">True</property>
-            <property name="can_focus">True</property>
-            <property name="receives_default">True</property>
+            <property name="can_focus">1</property>
+            <property name="receives_default">1</property>
+            <layout>
+              <property name="left_attach">3</property>
+              <property name="top_attach">0</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">3</property>
-            <property name="top_attach">0</property>
-          </packing>
         </child>
         <child>
           <object class="GtkButton" id="button6">
             <property name="label" translatable="yes">button</property>
-            <property name="visible">True</property>
-            <property name="can_focus">True</property>
-            <property name="receives_default">True</property>
+            <property name="can_focus">1</property>
+            <property name="receives_default">1</property>
+            <layout>
+              <property name="left_attach">2</property>
+              <property name="top_attach">0</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">2</property>
-            <property name="top_attach">0</property>
-          </packing>
         </child>
         <child>
           <object class="GtkButton" id="button7">
             <property name="label" translatable="yes">button</property>
-            <property name="visible">True</property>
-            <property name="can_focus">True</property>
-            <property name="receives_default">True</property>
+            <property name="can_focus">1</property>
+            <property name="receives_default">1</property>
+            <layout>
+              <property name="left_attach">1</property>
+              <property name="top_attach">0</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">1</property>
-            <property name="top_attach">0</property>
-          </packing>
         </child>
         <child>
           <object class="GtkButton" id="button8">
             <property name="label" translatable="yes">button</property>
-            <property name="visible">True</property>
-            <property name="can_focus">True</property>
-            <property name="receives_default">True</property>
+            <property name="can_focus">1</property>
+            <property name="receives_default">1</property>
+            <layout>
+              <property name="left_attach">3</property>
+              <property name="top_attach">3</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">3</property>
-            <property name="top_attach">3</property>
-          </packing>
         </child>
         <child>
           <object class="GtkButton" id="button9">
             <property name="label" translatable="yes">button</property>
-            <property name="visible">True</property>
-            <property name="can_focus">True</property>
-            <property name="receives_default">True</property>
+            <property name="can_focus">1</property>
+            <property name="receives_default">1</property>
+            <layout>
+              <property name="left_attach">3</property>
+              <property name="top_attach">2</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">3</property>
-            <property name="top_attach">2</property>
-          </packing>
         </child>
         <child>
           <object class="GtkButton" id="button10">
             <property name="label" translatable="yes">button</property>
-            <property name="visible">True</property>
-            <property name="can_focus">True</property>
-            <property name="receives_default">True</property>
+            <property name="can_focus">1</property>
+            <property name="receives_default">1</property>
+            <layout>
+              <property name="left_attach">3</property>
+              <property name="top_attach">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">3</property>
-            <property name="top_attach">1</property>
-          </packing>
         </child>
         <child>
           <object class="GtkButton" id="button11">
             <property name="label" translatable="yes">button</property>
-            <property name="visible">True</property>
-            <property name="can_focus">True</property>
-            <property name="receives_default">True</property>
+            <property name="can_focus">1</property>
+            <property name="receives_default">1</property>
+            <layout>
+              <property name="left_attach">2</property>
+              <property name="top_attach">3</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">2</property>
-            <property name="top_attach">3</property>
-          </packing>
         </child>
         <child>
           <object class="GtkButton" id="button12">
             <property name="label" translatable="yes">button</property>
-            <property name="visible">True</property>
-            <property name="can_focus">True</property>
-            <property name="receives_default">True</property>
+            <property name="can_focus">1</property>
+            <property name="receives_default">1</property>
+            <layout>
+              <property name="left_attach">1</property>
+              <property name="top_attach">3</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">1</property>
-            <property name="top_attach">3</property>
-          </packing>
         </child>
         <child>
           <object class="GtkButton" id="button13">
             <property name="label" translatable="yes">button</property>
-            <property name="visible">True</property>
-            <property name="can_focus">True</property>
-            <property name="receives_default">True</property>
+            <property name="can_focus">1</property>
+            <property name="receives_default">1</property>
+            <layout>
+              <property name="left_attach">2</property>
+              <property name="top_attach">2</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">2</property>
-            <property name="top_attach">2</property>
-          </packing>
         </child>
         <child>
           <object class="GtkButton" id="button14">
             <property name="label" translatable="yes">button</property>
-            <property name="visible">True</property>
-            <property name="can_focus">True</property>
-            <property name="receives_default">True</property>
+            <property name="can_focus">1</property>
+            <property name="receives_default">1</property>
+            <layout>
+              <property name="left_attach">2</property>
+              <property name="top_attach">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">2</property>
-            <property name="top_attach">1</property>
-          </packing>
         </child>
         <child>
           <object class="GtkButton" id="button15">
             <property name="label" translatable="yes">button</property>
-            <property name="visible">True</property>
-            <property name="can_focus">True</property>
-            <property name="receives_default">True</property>
+            <property name="can_focus">1</property>
+            <property name="receives_default">1</property>
+            <layout>
+              <property name="left_attach">1</property>
+              <property name="top_attach">2</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">1</property>
-            <property name="top_attach">2</property>
-          </packing>
         </child>
         <child>
           <object class="GtkButton" id="button16">
             <property name="label" translatable="yes">button</property>
-            <property name="visible">True</property>
-            <property name="can_focus">True</property>
-            <property name="receives_default">True</property>
+            <property name="can_focus">1</property>
+            <property name="receives_default">1</property>
+            <layout>
+              <property name="left_attach">1</property>
+              <property name="top_attach">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">1</property>
-            <property name="top_attach">1</property>
-          </packing>
         </child>
       </object>
     </child>

diff --git a/testsuite/reftests/border-corner-zero-width-rendering.ui b/testsuite/reftests/border-corner-zero-width-rendering.ui
index e413029cfe81730066f82ef0e8239c3b94ae17c8..51f3df159acaeb4c0df346f007ceb6151c237813 100644 (file)
--- a/testsuite/reftests/border-corner-zero-width-rendering.ui
+++ b/testsuite/reftests/border-corner-zero-width-rendering.ui
@@ -1,267 +1,247 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!-- Generated with glade 3.18.3 -->
 <interface>
   <requires lib="gtk+" version="3.12"/>
   <object class="GtkWindow" id="window1">
-    <property name="can_focus">False</property>
     <property name="type">popup</property>
     <child>
       <object class="GtkGrid" id="grid1">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
         <child>
           <object class="GtkButton" id="button1">
             <property name="label" translatable="yes">button</property>
-            <property name="visible">True</property>
-            <property name="can_focus">True</property>
-            <property name="receives_default">True</property>
+            <property name="can_focus">1</property>
+            <property name="receives_default">1</property>
+            <layout>
+              <property name="left_attach">0</property>
+              <property name="top_attach">0</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">0</property>
-            <property name="top_attach">0</property>
-          </packing>
         </child>
         <child>
           <object class="GtkButton" id="button2">
             <property name="label" translatable="yes">button</property>
-            <property name="visible">True</property>
-            <property name="can_focus">True</property>
-            <property name="receives_default">True</property>
+            <property name="can_focus">1</property>
+            <property name="receives_default">1</property>
             <style>
               <class name="top"/>
             </style>
+            <layout>
+              <property name="left_attach">0</property>
+              <property name="top_attach">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">0</property>
-            <property name="top_attach">1</property>
-          </packing>
         </child>
         <child>
           <object class="GtkButton" id="button3">
             <property name="label" translatable="yes">button</property>
-            <property name="visible">True</property>
-            <property name="can_focus">True</property>
-            <property name="receives_default">True</property>
+            <property name="can_focus">1</property>
+            <property name="receives_default">1</property>
             <style>
               <class name="bottom"/>
               <class name="top"/>
             </style>
+            <layout>
+              <property name="left_attach">0</property>
+              <property name="top_attach">3</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">0</property>
-            <property name="top_attach">3</property>
-          </packing>
         </child>
         <child>
           <object class="GtkButton" id="button4">
             <property name="label" translatable="yes">button</property>
-            <property name="visible">True</property>
-            <property name="can_focus">True</property>
-            <property name="receives_default">True</property>
+            <property name="can_focus">1</property>
+            <property name="receives_default">1</property>
             <style>
               <class name="bottom"/>
             </style>
+            <layout>
+              <property name="left_attach">0</property>
+              <property name="top_attach">2</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">0</property>
-            <property name="top_attach">2</property>
-          </packing>
         </child>
         <child>
           <object class="GtkButton" id="button5">
             <property name="label" translatable="yes">button</property>
-            <property name="visible">True</property>
-            <property name="can_focus">True</property>
-            <property name="receives_default">True</property>
+            <property name="can_focus">1</property>
+            <property name="receives_default">1</property>
             <style>
               <class name="left"/>
               <class name="right"/>
             </style>
+            <layout>
+              <property name="left_attach">3</property>
+              <property name="top_attach">0</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">3</property>
-            <property name="top_attach">0</property>
-          </packing>
         </child>
         <child>
           <object class="GtkButton" id="button6">
             <property name="label" translatable="yes">button</property>
-            <property name="visible">True</property>
-            <property name="can_focus">True</property>
-            <property name="receives_default">True</property>
+            <property name="can_focus">1</property>
+            <property name="receives_default">1</property>
             <style>
               <class name="right"/>
             </style>
+            <layout>
+              <property name="left_attach">2</property>
+              <property name="top_attach">0</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">2</property>
-            <property name="top_attach">0</property>
-          </packing>
         </child>
         <child>
           <object class="GtkButton" id="button7">
             <property name="label" translatable="yes">button</property>
-            <property name="visible">True</property>
-            <property name="can_focus">True</property>
-            <property name="receives_default">True</property>
+            <property name="can_focus">1</property>
+            <property name="receives_default">1</property>
             <style>
               <class name="left"/>
             </style>
+            <layout>
+              <property name="left_attach">1</property>
+              <property name="top_attach">0</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">1</property>
-            <property name="top_attach">0</property>
-          </packing>
         </child>
         <child>
           <object class="GtkButton" id="button8">
             <property name="label" translatable="yes">button</property>
-            <property name="visible">True</property>
-            <property name="can_focus">True</property>
-            <property name="receives_default">True</property>
+            <property name="can_focus">1</property>
+            <property name="receives_default">1</property>
             <style>
               <class name="bottom"/>
               <class name="top"/>
               <class name="left"/>
               <class name="right"/>
             </style>
+            <layout>
+              <property name="left_attach">3</property>
+              <property name="top_attach">3</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">3</property>
-            <property name="top_attach">3</property>
-          </packing>
         </child>
         <child>
           <object class="GtkButton" id="button9">
             <property name="label" translatable="yes">button</property>
-            <property name="visible">True</property>
-            <property name="can_focus">True</property>
-            <property name="receives_default">True</property>
+            <property name="can_focus">1</property>
+            <property name="receives_default">1</property>
             <style>
               <class name="bottom"/>
               <class name="left"/>
               <class name="right"/>
             </style>
+            <layout>
+              <property name="left_attach">3</property>
+              <property name="top_attach">2</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">3</property>
-            <property name="top_attach">2</property>
-          </packing>
         </child>
         <child>
           <object class="GtkButton" id="button10">
             <property name="label" translatable="yes">button</property>
-            <property name="visible">True</property>
-            <property name="can_focus">True</property>
-            <property name="receives_default">True</property>
+            <property name="can_focus">1</property>
+            <property name="receives_default">1</property>
             <style>
               <class name="top"/>
               <class name="left"/>
               <class name="right"/>
             </style>
+            <layout>
+              <property name="left_attach">3</property>
+              <property name="top_attach">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">3</property>
-            <property name="top_attach">1</property>
-          </packing>
         </child>
         <child>
           <object class="GtkButton" id="button11">
             <property name="label" translatable="yes">button</property>
-            <property name="visible">True</property>
-            <property name="can_focus">True</property>
-            <property name="receives_default">True</property>
+            <property name="can_focus">1</property>
+            <property name="receives_default">1</property>
             <style>
               <class name="bottom"/>
               <class name="top"/>
               <class name="right"/>
             </style>
+            <layout>
+              <property name="left_attach">2</property>
+              <property name="top_attach">3</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">2</property>
-            <property name="top_attach">3</property>
-          </packing>
         </child>
         <child>
           <object class="GtkButton" id="button12">
             <property name="label" translatable="yes">button</property>
-            <property name="visible">True</property>
-            <property name="can_focus">True</property>
-            <property name="receives_default">True</property>
+            <property name="can_focus">1</property>
+            <property name="receives_default">1</property>
             <style>
               <class name="bottom"/>
               <class name="top"/>
               <class name="left"/>
             </style>
+            <layout>
+              <property name="left_attach">1</property>
+              <property name="top_attach">3</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">1</property>
-            <property name="top_attach">3</property>
-          </packing>
         </child>
         <child>
           <object class="GtkButton" id="button13">
             <property name="label" translatable="yes">button</property>
-            <property name="visible">True</property>
-            <property name="can_focus">True</property>
-            <property name="receives_default">True</property>
+            <property name="can_focus">1</property>
+            <property name="receives_default">1</property>
             <style>
               <class name="bottom"/>
               <class name="right"/>
             </style>
+            <layout>
+              <property name="left_attach">2</property>
+              <property name="top_attach">2</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">2</property>
-            <property name="top_attach">2</property>
-          </packing>
         </child>
         <child>
           <object class="GtkButton" id="button14">
             <property name="label" translatable="yes">button</property>
-            <property name="visible">True</property>
-            <property name="can_focus">True</property>
-            <property name="receives_default">True</property>
+            <property name="can_focus">1</property>
+            <property name="receives_default">1</property>
             <style>
               <class name="top"/>
               <class name="right"/>
             </style>
+            <layout>
+              <property name="left_attach">2</property>
+              <property name="top_attach">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">2</property>
-            <property name="top_attach">1</property>
-          </packing>
         </child>
         <child>
           <object class="GtkButton" id="button15">
             <property name="label" translatable="yes">button</property>
-            <property name="visible">True</property>
-            <property name="can_focus">True</property>
-            <property name="receives_default">True</property>
+            <property name="can_focus">1</property>
+            <property name="receives_default">1</property>
             <style>
               <class name="bottom"/>
               <class name="left"/>
             </style>
+            <layout>
+              <property name="left_attach">1</property>
+              <property name="top_attach">2</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">1</property>
-            <property name="top_attach">2</property>
-          </packing>
         </child>
         <child>
           <object class="GtkButton" id="button16">
             <property name="label" translatable="yes">button</property>
-            <property name="visible">True</property>
-            <property name="can_focus">True</property>
-            <property name="receives_default">True</property>
+            <property name="can_focus">1</property>
+            <property name="receives_default">1</property>
             <style>
               <class name="top"/>
               <class name="left"/>
             </style>
+            <layout>
+              <property name="left_attach">1</property>
+              <property name="top_attach">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">1</property>
-            <property name="top_attach">1</property>
-          </packing>
         </child>
       </object>
     </child>

diff --git a/testsuite/reftests/border-half-pixel.ref.ui b/testsuite/reftests/border-half-pixel.ref.ui
index c6aa81d1ce82174751ec78caa01e91a34d784bec..c4e75901a2de8bb5f2cabda381394de1687c77c7 100644 (file)
--- a/testsuite/reftests/border-half-pixel.ref.ui
+++ b/testsuite/reftests/border-half-pixel.ref.ui
@@ -1,15 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
-  <!-- interface-requires gtk+ 3.0 -->
   <object class="GtkWindow" id="window1">
-    <property name="can_focus">False</property>
     <property name="type">popup</property>
     <child>
       <object class="GtkButton" id="button1">
         <property name="name">reference</property>
-        <property name="visible">True</property>
-        <property name="can_focus">True</property>
-        <property name="receives_default">True</property>
+        <property name="can_focus">1</property>
+        <property name="receives_default">1</property>
       </object>
     </child>
   </object>

diff --git a/testsuite/reftests/border-half-pixel.ui b/testsuite/reftests/border-half-pixel.ui
index 248cd28c0b24200262c701d0ce586e6c7b0fb787..5171539c74f620659415a49770cbf2aed06720e0 100644 (file)
--- a/testsuite/reftests/border-half-pixel.ui
+++ b/testsuite/reftests/border-half-pixel.ui
@@ -1,14 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
-  <!-- interface-requires gtk+ 3.0 -->
   <object class="GtkWindow" id="window1">
-    <property name="can_focus">False</property>
     <property name="type">popup</property>
     <child>
       <object class="GtkButton" id="button1">
-        <property name="visible">True</property>
-        <property name="can_focus">True</property>
-        <property name="receives_default">True</property>
+        <property name="can_focus">1</property>
+        <property name="receives_default">1</property>
       </object>
     </child>
   </object>

diff --git a/testsuite/reftests/border-image-excess-size.ref.ui b/testsuite/reftests/border-image-excess-size.ref.ui
index 488d6976d1f243c633591426d8864f9e873fce53..9da0c1204dbfc53076d5b787db17bda16d31ce10 100644 (file)
--- a/testsuite/reftests/border-image-excess-size.ref.ui
+++ b/testsuite/reftests/border-image-excess-size.ref.ui
@@ -1,74 +1,66 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
-  <!-- interface-requires gtk+ 3.0 -->
   <object class="GtkWindow" id="window1">
-    <property name="can_focus">False</property>
     <property name="type">popup</property>
     <child>
       <object class="GtkGrid" id="grid1">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
         <property name="row_spacing">8</property>
         <property name="column_spacing">8</property>
         <child>
           <object class="GtkToolbar" id="toolbar1">
             <property name="width_request">1</property>
             <property name="height_request">1</property>
-            <property name="visible">True</property>
-            <property name="can_focus">True</property>
-            <property name="show_arrow">False</property>
+            <property name="can_focus">1</property>
+            <property name="show_arrow">0</property>
+            <layout>
+              <property name="left_attach">0</property>
+              <property name="top_attach">0</property>
+              <property name="column-span">1</property>
+              <property name="row-span">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">0</property>
-            <property name="top_attach">0</property>
-            <property name="width">1</property>
-            <property name="height">1</property>
-          </packing>
         </child>
         <child>
           <object class="GtkToolbar" id="toolbar2">
             <property name="width_request">1</property>
             <property name="height_request">1</property>
-            <property name="visible">True</property>
-            <property name="can_focus">True</property>
-            <property name="show_arrow">False</property>
+            <property name="can_focus">1</property>
+            <property name="show_arrow">0</property>
+            <layout>
+              <property name="left_attach">1</property>
+              <property name="top_attach">0</property>
+              <property name="column-span">1</property>
+              <property name="row-span">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">1</property>
-            <property name="top_attach">0</property>
-            <property name="width">1</property>
-            <property name="height">1</property>
-          </packing>
         </child>
         <child>
           <object class="GtkToolbar" id="toolbar3">
             <property name="width_request">1</property>
             <property name="height_request">1</property>
-            <property name="visible">True</property>
-            <property name="can_focus">True</property>
-            <property name="show_arrow">False</property>
+            <property name="can_focus">1</property>
+            <property name="show_arrow">0</property>
+            <layout>
+              <property name="left_attach">1</property>
+              <property name="top_attach">1</property>
+              <property name="column-span">1</property>
+              <property name="row-span">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">1</property>
-            <property name="top_attach">1</property>
-            <property name="width">1</property>
-            <property name="height">1</property>
-          </packing>
         </child>
         <child>
           <object class="GtkToolbar" id="toolbar4">
             <property name="width_request">1</property>
             <property name="height_request">1</property>
-            <property name="visible">True</property>
-            <property name="can_focus">True</property>
-            <property name="show_arrow">False</property>
+            <property name="can_focus">1</property>
+            <property name="show_arrow">0</property>
+            <layout>
+              <property name="left_attach">0</property>
+              <property name="top_attach">1</property>
+              <property name="column-span">1</property>
+              <property name="row-span">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">0</property>
-            <property name="top_attach">1</property>
-            <property name="width">1</property>
-            <property name="height">1</property>
-          </packing>
         </child>
       </object>
     </child>

diff --git a/testsuite/reftests/border-image-excess-size.ui b/testsuite/reftests/border-image-excess-size.ui
index 43bbfc7c52d1157de07762dae03abc7cd177de5e..f4a5021f48bed58aa878e8df37644c96a8203279 100644 (file)
--- a/testsuite/reftests/border-image-excess-size.ui
+++ b/testsuite/reftests/border-image-excess-size.ui
@@ -1,16 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
-  <!-- interface-requires gtk+ 3.0 -->
   <object class="GtkWindow" id="window1">
-    <property name="can_focus">False</property>
     <property name="type">popup</property>
     <child>
       <object class="GtkToolbar" id="toolbar1">
         <property name="width_request">10</property>
         <property name="height_request">10</property>
-        <property name="visible">True</property>
-        <property name="can_focus">True</property>
-        <property name="show_arrow">False</property>
+        <property name="can_focus">1</property>
+        <property name="show_arrow">0</property>
       </object>
     </child>
   </object>

diff --git a/testsuite/reftests/border-image-url-scaled.ref.ui b/testsuite/reftests/border-image-url-scaled.ref.ui
index 959d3fd3981e0e58a4e145849a25142426b00b95..3509cbc83015bc57948a67d3057c87420e2ea9ab 100644 (file)
--- a/testsuite/reftests/border-image-url-scaled.ref.ui
+++ b/testsuite/reftests/border-image-url-scaled.ref.ui
@@ -1,26 +1,22 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
-  <!-- interface-requires gtk+ 3.0 -->
   <object class="GtkWindow" id="window1">
-    <property name="can_focus">False</property>
     <property name="type">popup</property>
     <child>
       <object class="GtkButton" id="button1">
         <property name="name">reference</property>
-        <property name="visible">True</property>
-        <property name="can_focus">True</property>
-        <property name="has_focus">True</property>
-        <property name="receives_default">True</property>
+        <property name="can_focus">1</property>
+        <property name="has_focus">1</property>
+        <property name="receives_default">1</property>
         <style>
           <class name="button-not-image"/>
         </style>
         <child>
           <object class="GtkButton" id="button2">
             <property name="name">reference</property>
-            <property name="visible">True</property>
-            <property name="can_focus">True</property>
-            <property name="has_focus">True</property>
-            <property name="receives_default">True</property>
+            <property name="can_focus">1</property>
+            <property name="has_focus">1</property>
+            <property name="receives_default">1</property>
             <style>
               <class name="button-not-image2"/>
             </style>
@@ -28,10 +24,9 @@
               <object class="GtkButton" id="button3">
                 <property name="name">reference</property>
                 <property name="label" translatable="yes">Hello World</property>
-                <property name="visible">True</property>
-                <property name="can_focus">True</property>
-                <property name="has_focus">True</property>
-                <property name="receives_default">True</property>
+                <property name="can_focus">1</property>
+                <property name="has_focus">1</property>
+                <property name="receives_default">1</property>
                 <style>
                   <class name="button-not-image3"/>
                 </style>

diff --git a/testsuite/reftests/border-image-url-scaled.ui b/testsuite/reftests/border-image-url-scaled.ui
index 483f5031b4e372683d87a74eaa30d24f15288347..4542d594c8348461975e54ea4a351ee79f1e8d58 100644 (file)
--- a/testsuite/reftests/border-image-url-scaled.ui
+++ b/testsuite/reftests/border-image-url-scaled.ui
@@ -1,17 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
-  <!-- interface-requires gtk+ 3.0 -->
   <object class="GtkWindow" id="window1">
-    <property name="can_focus">False</property>
     <property name="type">popup</property>
     <child>
       <object class="GtkButton" id="button1">
         <property name="name">reference</property>
         <property name="label" translatable="yes">Hello World</property>
-        <property name="visible">True</property>
-        <property name="can_focus">True</property>
-        <property name="has_focus">True</property>
-        <property name="receives_default">True</property>
+        <property name="can_focus">1</property>
+        <property name="has_focus">1</property>
+        <property name="receives_default">1</property>
         <style>
           <class name="button-image"/>
         </style>

diff --git a/testsuite/reftests/border-image-url.ref.ui b/testsuite/reftests/border-image-url.ref.ui
index e039ffcbd513ea85e516fc5c1ac1344a41d0392b..b1464c4ac79bf01c597d56a08dad75f50981e6e8 100644 (file)
--- a/testsuite/reftests/border-image-url.ref.ui
+++ b/testsuite/reftests/border-image-url.ref.ui
@@ -1,17 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
-  <!-- interface-requires gtk+ 3.0 -->
   <object class="GtkWindow" id="window1">
-    <property name="can_focus">False</property>
     <property name="type">popup</property>
     <child>
       <object class="GtkButton" id="button1">
         <property name="name">reference</property>
         <property name="label" translatable="yes">Hello World</property>
-        <property name="visible">True</property>
-        <property name="can_focus">True</property>
-        <property name="has_focus">True</property>
-        <property name="receives_default">True</property>
+        <property name="can_focus">1</property>
+        <property name="has_focus">1</property>
+        <property name="receives_default">1</property>
         <style>
           <class name="button-not-image"/>
         </style>

diff --git a/testsuite/reftests/border-image-url.ui b/testsuite/reftests/border-image-url.ui
index 483f5031b4e372683d87a74eaa30d24f15288347..4542d594c8348461975e54ea4a351ee79f1e8d58 100644 (file)
--- a/testsuite/reftests/border-image-url.ui
+++ b/testsuite/reftests/border-image-url.ui
@@ -1,17 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
-  <!-- interface-requires gtk+ 3.0 -->
   <object class="GtkWindow" id="window1">
-    <property name="can_focus">False</property>
     <property name="type">popup</property>
     <child>
       <object class="GtkButton" id="button1">
         <property name="name">reference</property>
         <property name="label" translatable="yes">Hello World</property>
-        <property name="visible">True</property>
-        <property name="can_focus">True</property>
-        <property name="has_focus">True</property>
-        <property name="receives_default">True</property>
+        <property name="can_focus">1</property>
+        <property name="has_focus">1</property>
+        <property name="receives_default">1</property>
         <style>
           <class name="button-image"/>
         </style>

diff --git a/testsuite/reftests/border-radius-clamp.ref.ui b/testsuite/reftests/border-radius-clamp.ref.ui
index c38df4f94387aa23f4131d0e75bd4db11b8e551c..1f3fbc4282cf1dfcb0aa6cb5bc59811c13ab7247 100644 (file)
--- a/testsuite/reftests/border-radius-clamp.ref.ui
+++ b/testsuite/reftests/border-radius-clamp.ref.ui
@@ -1,16 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
-  <!-- interface-requires gtk+ 3.0 -->
   <object class="GtkWindow" id="window1">
-    <property name="can_focus">False</property>
     <property name="name">reference</property>
     <property name="type">popup</property>
     <child>
       <object class="GtkProgressBar" id="progressbar1">
         <property name="width_request">150</property>
         <property name="height_request">20</property>
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
         <property name="fraction">0.5</property>
       </object>
     </child>

diff --git a/testsuite/reftests/border-radius-clamp.ui b/testsuite/reftests/border-radius-clamp.ui
index 1617d3fa66e979d842836ba5798d8540227805f3..481c5508c2269758772d43851b19854316f995f5 100644 (file)
--- a/testsuite/reftests/border-radius-clamp.ui
+++ b/testsuite/reftests/border-radius-clamp.ui
@@ -1,15 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
-  <!-- interface-requires gtk+ 3.0 -->
   <object class="GtkWindow" id="window1">
-    <property name="can_focus">False</property>
     <property name="type">popup</property>
     <child>
       <object class="GtkProgressBar" id="progressbar1">
         <property name="width_request">150</property>
         <property name="height_request">20</property>
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
         <property name="fraction">0.5</property>
       </object>
     </child>

diff --git a/testsuite/reftests/border-style-none.ref.ui b/testsuite/reftests/border-style-none.ref.ui
index 9dc4de78f11fdb2e2a95f992fb9a1ca0d37c58be..ca4bfdeabd25cc672e364934af629969ec9126e2 100644 (file)
--- a/testsuite/reftests/border-style-none.ref.ui
+++ b/testsuite/reftests/border-style-none.ref.ui
@@ -1,16 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
-  <!-- interface-requires gtk+ 3.0 -->
   <object class="GtkWindow" id="window1">
-    <property name="can_focus">False</property>
     <property name="type">popup</property>
     <child>
       <object class="GtkButton" id="button1">
         <property name="name">reference</property>
-        <property name="visible">True</property>
-        <property name="can_focus">True</property>
-        <property name="receives_default">True</property>
-       <property name="width_request">144</property>
+        <property name="can_focus">1</property>
+        <property name="receives_default">1</property>
+        <property name="width_request">144</property>
         <property name="height_request">144</property>
       </object>
     </child>

diff --git a/testsuite/reftests/border-style-none.ui b/testsuite/reftests/border-style-none.ui
index 58c2416bf913da90ce69c30c2eeca08322506a6e..fc9d59898166ebaabbed2a901f0d80ec55d7e44c 100644 (file)
--- a/testsuite/reftests/border-style-none.ui
+++ b/testsuite/reftests/border-style-none.ui
@@ -1,15 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
-  <!-- interface-requires gtk+ 3.0 -->
   <object class="GtkWindow" id="window1">
-    <property name="can_focus">False</property>
     <property name="type">popup</property>
     <child>
       <object class="GtkButton" id="button1">
-        <property name="visible">True</property>
-        <property name="can_focus">True</property>
-        <property name="receives_default">True</property>
-       <property name="width_request">144</property>
+        <property name="can_focus">1</property>
+        <property name="receives_default">1</property>
+        <property name="width_request">144</property>
         <property name="height_request">144</property>
       </object>
     </child>

diff --git a/testsuite/reftests/border-style.ref.ui b/testsuite/reftests/border-style.ref.ui
index c4e87381f2691923336f2556e8b5dc3168bcfe57..88556a8377e0cfb9194701995d427e6be1684af5 100644 (file)
--- a/testsuite/reftests/border-style.ref.ui
+++ b/testsuite/reftests/border-style.ref.ui
@@ -1,30 +1,25 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
-  <!-- interface-requires gtk+ 3.0 -->
   <object class="GtkWindow" id="window1">
-    <property name="can_focus">False</property>
     <property name="type">popup</property>
     <child>
       <object class="GtkGrid" id="grid1">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
         <child>
           <object class="GtkButton" id="button1">
-            <property name="visible">True</property>
-            <property name="can_focus">True</property>
-            <property name="receives_default">True</property>
+            <property name="can_focus">1</property>
+            <property name="receives_default">1</property>
             <property name="width_request">40</property>
             <property name="height_request">40</property>
             <style>
               <class name="button-border"/>
             </style>
+            <layout>
+              <property name="left_attach">0</property>
+              <property name="top_attach">0</property>
+              <property name="column-span">1</property>
+              <property name="row-span">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">0</property>
-            <property name="top_attach">0</property>
-            <property name="width">1</property>
-            <property name="height">1</property>
-          </packing>
         </child>
       </object>
     </child>

diff --git a/testsuite/reftests/border-style.ui b/testsuite/reftests/border-style.ui
index 46e408b182672831b7e9ea6968c51fd83c98e7bf..e3c08e17a93f6c1525ab9687a9c028c9097eb5c4 100644 (file)
--- a/testsuite/reftests/border-style.ui
+++ b/testsuite/reftests/border-style.ui
@@ -1,84 +1,76 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
-  <!-- interface-requires gtk+ 3.0 -->
   <object class="GtkWindow" id="window1">
-    <property name="can_focus">False</property>
     <property name="type">popup</property>
     <child>
       <object class="GtkGrid" id="grid1">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
         <child>
           <object class="GtkButton" id="button1">
-            <property name="visible">True</property>
-            <property name="can_focus">True</property>
-            <property name="receives_default">True</property>
+            <property name="can_focus">1</property>
+            <property name="receives_default">1</property>
             <property name="width_request">20</property>
             <property name="height_request">20</property>
             <style>
               <class name="button-top-left"/>
             </style>
+            <layout>
+              <property name="left_attach">0</property>
+              <property name="top_attach">0</property>
+              <property name="column-span">1</property>
+              <property name="row-span">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">0</property>
-            <property name="top_attach">0</property>
-            <property name="width">1</property>
-            <property name="height">1</property>
-          </packing>
         </child>
         <child>
           <object class="GtkButton" id="button2">
-            <property name="visible">True</property>
-            <property name="can_focus">True</property>
-            <property name="receives_default">True</property>
+            <property name="can_focus">1</property>
+            <property name="receives_default">1</property>
             <property name="width_request">20</property>
             <property name="height_request">20</property>
             <style>
               <class name="button-top-right"/>
             </style>
+            <layout>
+              <property name="left_attach">1</property>
+              <property name="top_attach">0</property>
+              <property name="column-span">1</property>
+              <property name="row-span">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">1</property>
-            <property name="top_attach">0</property>
-            <property name="width">1</property>
-            <property name="height">1</property>
-          </packing>
         </child>
         <child>
           <object class="GtkButton" id="button3">
-            <property name="visible">True</property>
-            <property name="can_focus">True</property>
-            <property name="receives_default">True</property>
+            <property name="can_focus">1</property>
+            <property name="receives_default">1</property>
             <property name="width_request">20</property>
             <property name="height_request">20</property>
             <style>
               <class name="button-bottom-left"/>
             </style>
+            <layout>
+              <property name="left_attach">0</property>
+              <property name="top_attach">1</property>
+              <property name="column-span">1</property>
+              <property name="row-span">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">0</property>
-            <property name="top_attach">1</property>
-            <property name="width">1</property>
-            <property name="height">1</property>
-          </packing>
         </child>
         <child>
           <object class="GtkButton" id="button4">
-            <property name="visible">True</property>
-            <property name="can_focus">True</property>
-            <property name="receives_default">True</property>
+            <property name="can_focus">1</property>
+            <property name="receives_default">1</property>
             <property name="width_request">20</property>
             <property name="height_request">20</property>
             <style>
               <class name="button-bottom-right"/>
             </style>
+            <layout>
+              <property name="left_attach">1</property>
+              <property name="top_attach">1</property>
+              <property name="column-span">1</property>
+              <property name="row-span">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">1</property>
-            <property name="top_attach">1</property>
-            <property name="width">1</property>
-            <property name="height">1</property>
-          </packing>
         </child>
       </object>
     </child>

diff --git a/testsuite/reftests/box-order.ref.ui b/testsuite/reftests/box-order.ref.ui
index 103fb57f035fe04b2e502245d3594943f203d03d..7b539bfb85b8547cd604181f044813dc069a88f5 100644 (file)
--- a/testsuite/reftests/box-order.ref.ui
+++ b/testsuite/reftests/box-order.ref.ui
@@ -1,308 +1,224 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!-- Generated with glade 3.18.3 -->
 <interface>
   <requires lib="gtk+" version="3.12"/>
   <object class="GtkWindow" id="window1">
-    <property name="can_focus">False</property>
     <property name="type">popup</property>
     <child>
       <object class="GtkGrid" id="grid1">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
         <child>
           <object class="GtkBox" id="box1">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <child>
               <object class="GtkLabel" id="label1">
-                <property name="visible">True</property>
-                <property name="can_focus">False</property>
                 <property name="label" translatable="yes"> X X X </property>
               </object>
             </child>
             <child>
               <object class="GtkLabel" id="label2">
-                <property name="visible">True</property>
-                <property name="can_focus">False</property>
                 <property name="label" translatable="yes"> X X X </property>
               </object>
             </child>
             <child>
               <object class="GtkLabel" id="label3">
-                <property name="visible">True</property>
-                <property name="can_focus">False</property>
                 <property name="label" translatable="yes"> X X X </property>
               </object>
             </child>
             <child>
               <object class="GtkLabel" id="label4">
-                <property name="visible">True</property>
-                <property name="can_focus">False</property>
                 <property name="label" translatable="yes"> X X X </property>
               </object>
             </child>
             <child>
               <object class="GtkLabel" id="label5">
-                <property name="visible">True</property>
-                <property name="can_focus">False</property>
                 <property name="label" translatable="yes"> X X X </property>
               </object>
             </child>
             <child>
               <object class="GtkLabel" id="label6">
-                <property name="visible">True</property>
-                <property name="can_focus">False</property>
                 <property name="label" translatable="yes"> X X X </property>
               </object>
             </child>
             <child>
               <object class="GtkLabel" id="label7">
-                <property name="visible">True</property>
-                <property name="can_focus">False</property>
                 <property name="label" translatable="yes"> X X X </property>
               </object>
             </child>
+            <layout>
+              <property name="left_attach">0</property>
+              <property name="top_attach">0</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">0</property>
-            <property name="top_attach">0</property>
-          </packing>
         </child>
         <child>
           <object class="GtkBox" id="box2">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <child>
               <object class="GtkLabel" id="label8">
-                <property name="visible">True</property>
-                <property name="can_focus">False</property>
                 <property name="label" translatable="yes"> X X X </property>
               </object>
             </child>
             <child>
               <object class="GtkLabel" id="label9">
-                <property name="visible">True</property>
-                <property name="can_focus">False</property>
                 <property name="label" translatable="yes"> X X X </property>
               </object>
             </child>
             <child>
               <object class="GtkLabel" id="label10">
-                <property name="visible">True</property>
-                <property name="can_focus">False</property>
                 <property name="label" translatable="yes"> X X X </property>
               </object>
             </child>
             <child>
               <object class="GtkLabel" id="label11">
-                <property name="visible">True</property>
-                <property name="can_focus">False</property>
                 <property name="label" translatable="yes"> X X X </property>
               </object>
             </child>
             <child>
               <object class="GtkLabel" id="label12">
-                <property name="visible">True</property>
-                <property name="can_focus">False</property>
                 <property name="label" translatable="yes"> X X X </property>
               </object>
             </child>
             <child>
               <object class="GtkLabel" id="label13">
-                <property name="visible">True</property>
-                <property name="can_focus">False</property>
                 <property name="label" translatable="yes"> X X X </property>
               </object>
             </child>
             <child>
               <object class="GtkLabel" id="label14">
-                <property name="visible">True</property>
-                <property name="can_focus">False</property>
                 <property name="label" translatable="yes"> X X X </property>
               </object>
             </child>
+            <layout>
+              <property name="left_attach">0</property>
+              <property name="top_attach">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">0</property>
-            <property name="top_attach">1</property>
-          </packing>
         </child>
         <child>
           <object class="GtkBox" id="box3">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <child>
               <object class="GtkLabel" id="label15">
-                <property name="visible">True</property>
-                <property name="can_focus">False</property>
                 <property name="label" translatable="yes"> X X X </property>
               </object>
             </child>
             <child>
               <object class="GtkLabel" id="label16">
-                <property name="visible">True</property>
-                <property name="can_focus">False</property>
                 <property name="label" translatable="yes"> X X X </property>
               </object>
             </child>
             <child>
               <object class="GtkLabel" id="label17">
-                <property name="visible">True</property>
-                <property name="can_focus">False</property>
                 <property name="label" translatable="yes"> X X X </property>
               </object>
             </child>
             <child>
               <object class="GtkLabel" id="label18">
-                <property name="visible">True</property>
-                <property name="can_focus">False</property>
                 <property name="label" translatable="yes"> X X X </property>
               </object>
             </child>
             <child>
               <object class="GtkLabel" id="label19">
-                <property name="visible">True</property>
-                <property name="can_focus">False</property>
                 <property name="label" translatable="yes"> X X X </property>
               </object>
             </child>
             <child>
               <object class="GtkLabel" id="label20">
-                <property name="visible">True</property>
-                <property name="can_focus">False</property>
                 <property name="label" translatable="yes"> X X X </property>
               </object>
             </child>
             <child>
               <object class="GtkLabel" id="label21">
-                <property name="visible">True</property>
-                <property name="can_focus">False</property>
                 <property name="label" translatable="yes"> X X X </property>
               </object>
             </child>
+            <layout>
+              <property name="left_attach">0</property>
+              <property name="top_attach">2</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">0</property>
-            <property name="top_attach">2</property>
-          </packing>
         </child>
         <child>
           <object class="GtkBox" id="box4">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <child>
               <object class="GtkLabel" id="label22">
-                <property name="visible">True</property>
-                <property name="can_focus">False</property>
                 <property name="label" translatable="yes"> X X X </property>
               </object>
             </child>
             <child>
               <object class="GtkLabel" id="label23">
-                <property name="visible">True</property>
-                <property name="can_focus">False</property>
                 <property name="label" translatable="yes"> X X X </property>
               </object>
             </child>
             <child>
               <object class="GtkLabel" id="label24">
-                <property name="visible">True</property>
-                <property name="can_focus">False</property>
                 <property name="label" translatable="yes"> X X X </property>
               </object>
             </child>
             <child>
               <object class="GtkLabel" id="label25">
-                <property name="visible">True</property>
-                <property name="can_focus">False</property>
                 <property name="label" translatable="yes"> X X X </property>
               </object>
             </child>
             <child>
               <object class="GtkLabel" id="label26">
-                <property name="visible">True</property>
-                <property name="can_focus">False</property>
                 <property name="label" translatable="yes"> X X X </property>
               </object>
             </child>
             <child>
               <object class="GtkLabel" id="label27">
-                <property name="visible">True</property>
-                <property name="can_focus">False</property>
                 <property name="label" translatable="yes"> X X X </property>
               </object>
             </child>
             <child>
               <object class="GtkLabel" id="label28">
-                <property name="visible">True</property>
-                <property name="can_focus">False</property>
                 <property name="label" translatable="yes"> X X X </property>
               </object>
             </child>
+            <layout>
+              <property name="left_attach">0</property>
+              <property name="top_attach">3</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">0</property>
-            <property name="top_attach">3</property>
-          </packing>
         </child>
         <child>
           <object class="GtkBox" id="box5">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <child>
               <object class="GtkLabel" id="label29">
-                <property name="visible">True</property>
-                <property name="can_focus">False</property>
                 <property name="label" translatable="yes"> X X X </property>
               </object>
             </child>
             <child>
               <object class="GtkLabel" id="label30">
-                <property name="visible">True</property>
-                <property name="can_focus">False</property>
                 <property name="label" translatable="yes"> X X X </property>
               </object>
             </child>
             <child>
               <object class="GtkLabel" id="label31">
-                <property name="visible">True</property>
-                <property name="can_focus">False</property>
                 <property name="label" translatable="yes"> X X X </property>
               </object>
             </child>
             <child>
               <object class="GtkLabel" id="label32">
-                <property name="visible">True</property>
-                <property name="can_focus">False</property>
                 <property name="label" translatable="yes"> X X X </property>
               </object>
             </child>
             <child>
               <object class="GtkLabel" id="label33">
-                <property name="visible">True</property>
-                <property name="can_focus">False</property>
                 <property name="label" translatable="yes"> X X X </property>
               </object>
             </child>
             <child>
               <object class="GtkLabel" id="label34">
-                <property name="visible">True</property>
-                <property name="can_focus">False</property>
                 <property name="label" translatable="yes"> X X X </property>
               </object>
             </child>
             <child>
               <object class="GtkLabel" id="label35">
-                <property name="visible">True</property>
-                <property name="can_focus">False</property>
                 <property name="label" translatable="yes"> X X X </property>
               </object>
             </child>
+            <layout>
+              <property name="left_attach">0</property>
+              <property name="top_attach">4</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">0</property>
-            <property name="top_attach">4</property>
-          </packing>
         </child>
       </object>
     </child>

diff --git a/testsuite/reftests/box-order.ui b/testsuite/reftests/box-order.ui
index 679d3185de560e036f0bb610f097bad3e5abd4d7..8bf2687da77dcdd519a247ad1d1439c3cb674caa 100644 (file)
--- a/testsuite/reftests/box-order.ui
+++ b/testsuite/reftests/box-order.ui
@@ -1,331 +1,244 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!-- Generated with glade 3.18.3 -->
 <interface>
   <requires lib="gtk+" version="3.12"/>
   <object class="GtkWindow" id="window1">
-    <property name="can_focus">False</property>
     <property name="type">popup</property>
     <child>
       <object class="GtkGrid" id="grid1">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
         <child>
           <object class="GtkBox" id="box1">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <child>
               <object class="GtkLabel" id="label1">
-                <property name="visible">True</property>
-                <property name="can_focus">False</property>
                 <property name="label" translatable="yes"> X X X </property>
               </object>
             </child>
             <child>
               <object class="GtkLabel" id="label2">
-                <property name="visible">True</property>
-                <property name="can_focus">False</property>
                 <property name="label" translatable="yes"> X X X </property>
               </object>
             </child>
             <child>
               <object class="GtkLabel" id="label3">
-                <property name="visible">True</property>
-                <property name="can_focus">False</property>
                 <property name="label" translatable="yes"> X X X </property>
               </object>
             </child>
             <child>
               <object class="GtkLabel" id="label4">
-                <property name="visible">True</property>
-                <property name="can_focus">False</property>
                 <property name="label" translatable="yes"> X X X </property>
               </object>
             </child>
             <child>
               <object class="GtkLabel" id="label5">
-                <property name="visible">True</property>
-                <property name="can_focus">False</property>
                 <property name="label" translatable="yes"> X X X </property>
               </object>
             </child>
             <child>
               <object class="GtkLabel" id="label16">
-                <property name="visible">True</property>
-                <property name="can_focus">False</property>
                 <property name="label" translatable="yes"> X X X </property>
               </object>
             </child>
             <child>
               <object class="GtkLabel" id="label17">
-                <property name="visible">True</property>
-                <property name="can_focus">False</property>
                 <property name="label" translatable="yes"> X X X </property>
               </object>
             </child>
+            <layout>
+              <property name="left_attach">0</property>
+              <property name="top_attach">0</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">0</property>
-            <property name="top_attach">0</property>
-          </packing>
         </child>
         <child>
           <object class="GtkBox" id="box2">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <child>
               <object class="GtkLabel" id="label6">
-                <property name="visible">True</property>
-                <property name="can_focus">False</property>
                 <property name="label" translatable="yes"> X X X </property>
               </object>
             </child>
             <child>
               <object class="GtkLabel" id="label7">
-                <property name="visible">True</property>
-                <property name="can_focus">False</property>
                 <property name="label" translatable="yes"> X X X </property>
               </object>
             </child>
             <child>
               <object class="GtkLabel" id="label8">
-                <property name="visible">True</property>
-                <property name="can_focus">False</property>
                 <property name="label" translatable="yes"> X X X </property>
               </object>
             </child>
             <child>
               <object class="GtkLabel" id="label9">
-                <property name="visible">True</property>
-                <property name="can_focus">False</property>
                 <property name="label" translatable="yes"> X X X </property>
               </object>
             </child>
             <child>
               <object class="GtkLabel" id="label10">
-                <property name="visible">True</property>
-                <property name="can_focus">False</property>
                 <property name="label" translatable="yes"> X X X </property>
               </object>
             </child>
             <child>
               <object class="GtkLabel" id="label11">
-                <property name="visible">True</property>
-                <property name="can_focus">False</property>
                 <property name="label" translatable="yes"> X X X </property>
               </object>
             </child>
             <child>
               <object class="GtkLabel" id="label12">
-                <property name="visible">True</property>
-                <property name="can_focus">False</property>
                 <property name="label" translatable="yes"> X X X </property>
               </object>
             </child>
+            <layout>
+              <property name="left_attach">0</property>
+              <property name="top_attach">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">0</property>
-            <property name="top_attach">1</property>
-          </packing>
         </child>
         <child>
           <object class="GtkBox" id="box3">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <child>
               <object class="GtkLabel" id="label13">
-                <property name="visible">True</property>
-                <property name="can_focus">False</property>
                 <property name="label" translatable="yes"> X X X </property>
               </object>
             </child>
             <child>
               <object class="GtkLabel" id="label14">
-                <property name="can_focus">False</property>
                 <property name="label" translatable="yes"> X X X </property>
               </object>
             </child>
             <child>
               <object class="GtkLabel" id="label15">
-                <property name="visible">True</property>
-                <property name="can_focus">False</property>
                 <property name="label" translatable="yes"> X X X </property>
               </object>
             </child>
             <child>
               <object class="GtkLabel" id="label18">
-                <property name="can_focus">False</property>
                 <property name="label" translatable="yes"> X X X </property>
               </object>
             </child>
             <child>
               <object class="GtkLabel" id="label19">
-                <property name="visible">True</property>
-                <property name="can_focus">False</property>
                 <property name="label" translatable="yes"> X X X </property>
               </object>
             </child>
             <child>
               <object class="GtkLabel" id="label22">
-                <property name="can_focus">False</property>
                 <property name="label" translatable="yes"> X X X </property>
               </object>
             </child>
             <child>
               <object class="GtkLabel" id="label23">
-                <property name="visible">True</property>
-                <property name="can_focus">False</property>
                 <property name="label" translatable="yes"> X X X </property>
               </object>
             </child>
             <child>
               <object class="GtkLabel" id="label27">
-                <property name="can_focus">False</property>
                 <property name="label" translatable="yes"> X X X </property>
               </object>
             </child>
             <child>
               <object class="GtkLabel" id="label24">
-                <property name="visible">True</property>
-                <property name="can_focus">False</property>
                 <property name="label" translatable="yes"> X X X </property>
               </object>
             </child>
             <child>
               <object class="GtkLabel" id="label25">
-                <property name="can_focus">False</property>
                 <property name="label" translatable="yes"> X X X </property>
               </object>
             </child>
             <child>
               <object class="GtkLabel" id="label26">
-                <property name="visible">True</property>
-                <property name="can_focus">False</property>
                 <property name="label" translatable="yes"> X X X </property>
               </object>
             </child>
+            <layout>
+              <property name="left_attach">0</property>
+              <property name="top_attach">2</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">0</property>
-            <property name="top_attach">2</property>
-          </packing>
         </child>
         <child>
           <object class="GtkBox" id="box4">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <child>
               <object class="GtkLabel" id="label28">
-                <property name="visible">True</property>
-                <property name="can_focus">False</property>
                 <property name="label" translatable="yes"> X X X </property>
               </object>
             </child>
             <child>
               <object class="GtkLabel" id="label29">
-                <property name="visible">True</property>
-                <property name="can_focus">False</property>
                 <property name="label" translatable="yes"> X X X </property>
               </object>
             </child>
             <child>
               <object class="GtkLabel" id="label30">
-                <property name="visible">True</property>
-                <property name="can_focus">False</property>
                 <property name="label" translatable="yes"> X X X </property>
               </object>
             </child>
             <child>
               <object class="GtkLabel" id="label31">
-                <property name="visible">True</property>
-                <property name="can_focus">False</property>
                 <property name="label" translatable="yes"> X X X </property>
               </object>
             </child>
             <child>
               <object class="GtkLabel" id="label32">
-                <property name="visible">True</property>
-                <property name="can_focus">False</property>
                 <property name="label" translatable="yes"> X X X </property>
               </object>
             </child>
             <child>
               <object class="GtkLabel" id="label33">
-                <property name="visible">True</property>
-                <property name="can_focus">False</property>
                 <property name="label" translatable="yes"> X X X </property>
               </object>
             </child>
             <child>
               <object class="GtkLabel" id="label34">
-                <property name="visible">True</property>
-                <property name="can_focus">False</property>
                 <property name="label" translatable="yes"> X X X </property>
               </object>
             </child>
+            <layout>
+              <property name="left_attach">0</property>
+              <property name="top_attach">3</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">0</property>
-            <property name="top_attach">3</property>
-          </packing>
         </child>
         <child>
           <object class="GtkBox" id="box5">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <child>
               <object class="GtkLabel" id="label35">
-                <property name="visible">True</property>
-                <property name="can_focus">False</property>
                 <property name="label" translatable="yes"> X X X </property>
               </object>
             </child>
             <child>
               <object class="GtkLabel" id="label36">
-                <property name="visible">True</property>
-                <property name="can_focus">False</property>
                 <property name="label" translatable="yes"> X X X </property>
               </object>
             </child>
             <child>
               <object class="GtkLabel" id="label37">
-                <property name="visible">True</property>
-                <property name="can_focus">False</property>
                 <property name="label" translatable="yes"> X X X </property>
               </object>
             </child>
             <child>
               <object class="GtkLabel" id="label38">
-                <property name="visible">True</property>
-                <property name="can_focus">False</property>
                 <property name="label" translatable="yes"> X X X </property>
               </object>
             </child>
             <child>
               <object class="GtkLabel" id="label39">
-                <property name="visible">True</property>
-                <property name="can_focus">False</property>
                 <property name="label" translatable="yes"> X X X </property>
               </object>
             </child>
             <child>
               <object class="GtkLabel" id="label40">
-                <property name="visible">True</property>
-                <property name="can_focus">False</property>
                 <property name="label" translatable="yes"> X X X </property>
               </object>
             </child>
             <child>
               <object class="GtkLabel" id="label41">
-                <property name="visible">True</property>
-                <property name="can_focus">False</property>
                 <property name="label" translatable="yes"> X X X </property>
               </object>
             </child>
+            <layout>
+              <property name="left_attach">0</property>
+              <property name="top_attach">4</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">0</property>
-            <property name="top_attach">4</property>
-          </packing>
         </child>
       </object>
     </child>

diff --git a/testsuite/reftests/box-pseudo-classes.ref.ui b/testsuite/reftests/box-pseudo-classes.ref.ui
index fd6986ecc747df4c42edaa48c2ac36d67624656a..acb21faa983a63a7cd15b669e33b8ff3c466e132 100644 (file)
--- a/testsuite/reftests/box-pseudo-classes.ref.ui
+++ b/testsuite/reftests/box-pseudo-classes.ref.ui
@@ -1,60 +1,49 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
-  <!-- interface-requires gtk+ 3.0 -->
   <object class="GtkWindow" id="window1">
-    <property name="can_focus">False</property>
     <property name="type">popup</property>
     <child>
       <object class="GtkBox" id="box1">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
         <child>
           <object class="GtkBox" id="box2">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="orientation">vertical</property>
             <child>
               <object class="GtkButton" id="button1">
                 <property name="label" translatable="yes">button</property>
-                <property name="visible">True</property>
-                <property name="can_focus">True</property>
-                <property name="receives_default">True</property>
+                <property name="can_focus">1</property>
+                <property name="receives_default">1</property>
                 <property name="name">purple</property>
               </object>
             </child>
             <child>
               <object class="GtkButton" id="button2">
                 <property name="label" translatable="yes">button</property>
-                <property name="visible">True</property>
-                <property name="can_focus">True</property>
-                <property name="receives_default">True</property>
+                <property name="can_focus">1</property>
+                <property name="receives_default">1</property>
                 <property name="name">yellow</property>
               </object>
             </child>
             <child>
               <object class="GtkButton" id="button3">
                 <property name="label" translatable="yes">button</property>
-                <property name="visible">True</property>
-                <property name="can_focus">True</property>
-                <property name="receives_default">True</property>
+                <property name="can_focus">1</property>
+                <property name="receives_default">1</property>
                 <property name="name">red</property>
               </object>
             </child>
             <child>
               <object class="GtkButton" id="button4">
                 <property name="label" translatable="yes">button</property>
-                <property name="visible">True</property>
-                <property name="can_focus">True</property>
-                <property name="receives_default">True</property>
+                <property name="can_focus">1</property>
+                <property name="receives_default">1</property>
                 <property name="name">yellow</property>
               </object>
             </child>
             <child>
               <object class="GtkButton" id="button5">
                 <property name="label" translatable="yes">button</property>
-                <property name="visible">True</property>
-                <property name="can_focus">True</property>
-                <property name="receives_default">True</property>
+                <property name="can_focus">1</property>
+                <property name="receives_default">1</property>
                 <property name="name">purple</property>
               </object>
             </child>
@@ -62,42 +51,36 @@
         </child>
         <child>
           <object class="GtkBox" id="box3">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="orientation">vertical</property>
             <child>
               <object class="GtkButton" id="button7">
                 <property name="label" translatable="yes">button</property>
-                <property name="visible">True</property>
-                <property name="can_focus">True</property>
-                <property name="receives_default">True</property>
+                <property name="can_focus">1</property>
+                <property name="receives_default">1</property>
                 <property name="name">purple</property>
               </object>
             </child>
             <child>
               <object class="GtkButton" id="button8">
                 <property name="label" translatable="yes">button</property>
-                <property name="visible">True</property>
-                <property name="can_focus">True</property>
-                <property name="receives_default">True</property>
+                <property name="can_focus">1</property>
+                <property name="receives_default">1</property>
                 <property name="name">yellow</property>
               </object>
             </child>
             <child>
               <object class="GtkButton" id="button9">
                 <property name="label" translatable="yes">button</property>
-                <property name="visible">True</property>
-                <property name="can_focus">True</property>
-                <property name="receives_default">True</property>
+                <property name="can_focus">1</property>
+                <property name="receives_default">1</property>
                 <property name="name">red</property>
               </object>
             </child>
             <child>
               <object class="GtkButton" id="button10">
                 <property name="label" translatable="yes">button</property>
-                <property name="visible">True</property>
-                <property name="can_focus">True</property>
-                <property name="receives_default">True</property>
+                <property name="can_focus">1</property>
+                <property name="receives_default">1</property>
                 <property name="name">green</property>
               </object>
             </child>
@@ -105,33 +88,28 @@
         </child>
         <child>
           <object class="GtkBox" id="box4">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="orientation">vertical</property>
             <child>
               <object class="GtkButton" id="button13">
                 <property name="label" translatable="yes">button</property>
-                <property name="visible">True</property>
-                <property name="can_focus">True</property>
-                <property name="receives_default">True</property>
+                <property name="can_focus">1</property>
+                <property name="receives_default">1</property>
                 <property name="name">purple</property>
               </object>
             </child>
             <child>
               <object class="GtkButton" id="button14">
                 <property name="label" translatable="yes">button</property>
-                <property name="visible">True</property>
-                <property name="can_focus">True</property>
-                <property name="receives_default">True</property>
+                <property name="can_focus">1</property>
+                <property name="receives_default">1</property>
                 <property name="name">yellow</property>
               </object>
             </child>
             <child>
               <object class="GtkButton" id="button15">
                 <property name="label" translatable="yes">button</property>
-                <property name="visible">True</property>
-                <property name="can_focus">True</property>
-                <property name="receives_default">True</property>
+                <property name="can_focus">1</property>
+                <property name="receives_default">1</property>
                 <property name="name">purple</property>
               </object>
             </child>
@@ -139,24 +117,20 @@
         </child>
         <child>
           <object class="GtkBox" id="box5">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="orientation">vertical</property>
             <child>
               <object class="GtkButton" id="button6">
                 <property name="label" translatable="yes">button</property>
-                <property name="visible">True</property>
-                <property name="can_focus">True</property>
-                <property name="receives_default">True</property>
+                <property name="can_focus">1</property>
+                <property name="receives_default">1</property>
                 <property name="name">purple</property>
               </object>
             </child>
             <child>
               <object class="GtkButton" id="button11">
                 <property name="label" translatable="yes">button</property>
-                <property name="visible">True</property>
-                <property name="can_focus">True</property>
-                <property name="receives_default">True</property>
+                <property name="can_focus">1</property>
+                <property name="receives_default">1</property>
                 <property name="name">green</property>
               </object>
             </child>
@@ -164,15 +138,12 @@
         </child>
         <child>
           <object class="GtkBox" id="box6">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="orientation">vertical</property>
             <child>
               <object class="GtkButton" id="button12">
                 <property name="label" translatable="yes">button</property>
-                <property name="visible">True</property>
-                <property name="can_focus">True</property>
-                <property name="receives_default">True</property>
+                <property name="can_focus">1</property>
+                <property name="receives_default">1</property>
                 <property name="name">blue</property>
               </object>
             </child>

diff --git a/testsuite/reftests/box-pseudo-classes.ui b/testsuite/reftests/box-pseudo-classes.ui
index 3b34d7596cc8ccb8579f23ec9e4d1067b11d7603..f458da27954a1ab9e25633103119ef759dd7eb86 100644 (file)
--- a/testsuite/reftests/box-pseudo-classes.ui
+++ b/testsuite/reftests/box-pseudo-classes.ui
@@ -1,164 +1,135 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
-  <!-- interface-requires gtk+ 3.0 -->
   <object class="GtkWindow" id="window1">
-    <property name="can_focus">False</property>
     <property name="type">popup</property>
     <child>
       <object class="GtkBox" id="box1">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
         <child>
           <object class="GtkBox" id="box2">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="orientation">vertical</property>
             <child>
               <object class="GtkButton" id="button1">
                 <property name="label" translatable="yes">button</property>
-                <property name="visible">True</property>
-                <property name="can_focus">True</property>
-                <property name="receives_default">True</property>
+                <property name="can_focus">1</property>
+                <property name="receives_default">1</property>
               </object>
             </child>
             <child>
               <object class="GtkButton" id="button2">
                 <property name="label" translatable="yes">button</property>
-                <property name="visible">True</property>
-                <property name="can_focus">True</property>
-                <property name="receives_default">True</property>
+                <property name="can_focus">1</property>
+                <property name="receives_default">1</property>
               </object>
             </child>
             <child>
               <object class="GtkButton" id="button3">
                 <property name="label" translatable="yes">button</property>
-                <property name="visible">True</property>
-                <property name="can_focus">True</property>
-                <property name="receives_default">True</property>
+                <property name="can_focus">1</property>
+                <property name="receives_default">1</property>
               </object>
             </child>
             <child>
               <object class="GtkButton" id="button4">
                 <property name="label" translatable="yes">button</property>
-                <property name="visible">True</property>
-                <property name="can_focus">True</property>
-                <property name="receives_default">True</property>
+                <property name="can_focus">1</property>
+                <property name="receives_default">1</property>
               </object>
             </child>
             <child>
               <object class="GtkButton" id="button5">
                 <property name="label" translatable="yes">button</property>
-                <property name="visible">True</property>
-                <property name="can_focus">True</property>
-                <property name="receives_default">True</property>
+                <property name="can_focus">1</property>
+                <property name="receives_default">1</property>
               </object>
             </child>
           </object>
         </child>
         <child>
           <object class="GtkBox" id="box3">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="orientation">vertical</property>
             <child>
               <object class="GtkButton" id="button7">
                 <property name="label" translatable="yes">button</property>
-                <property name="visible">True</property>
-                <property name="can_focus">True</property>
-                <property name="receives_default">True</property>
+                <property name="can_focus">1</property>
+                <property name="receives_default">1</property>
               </object>
             </child>
             <child>
               <object class="GtkButton" id="button8">
                 <property name="label" translatable="yes">button</property>
-                <property name="visible">True</property>
-                <property name="can_focus">True</property>
-                <property name="receives_default">True</property>
+                <property name="can_focus">1</property>
+                <property name="receives_default">1</property>
               </object>
             </child>
             <child>
               <object class="GtkButton" id="button9">
                 <property name="label" translatable="yes">button</property>
-                <property name="visible">True</property>
-                <property name="can_focus">True</property>
-                <property name="receives_default">True</property>
+                <property name="can_focus">1</property>
+                <property name="receives_default">1</property>
               </object>
             </child>
             <child>
               <object class="GtkButton" id="button10">
                 <property name="label" translatable="yes">button</property>
-                <property name="visible">True</property>
-                <property name="can_focus">True</property>
-                <property name="receives_default">True</property>
+                <property name="can_focus">1</property>
+                <property name="receives_default">1</property>
               </object>
             </child>
           </object>
         </child>
         <child>
           <object class="GtkBox" id="box4">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="orientation">vertical</property>
             <child>
               <object class="GtkButton" id="button13">
                 <property name="label" translatable="yes">button</property>
-                <property name="visible">True</property>
-                <property name="can_focus">True</property>
-                <property name="receives_default">True</property>
+                <property name="can_focus">1</property>
+                <property name="receives_default">1</property>
               </object>
             </child>
             <child>
               <object class="GtkButton" id="button14">
                 <property name="label" translatable="yes">button</property>
-                <property name="visible">True</property>
-                <property name="can_focus">True</property>
-                <property name="receives_default">True</property>
+                <property name="can_focus">1</property>
+                <property name="receives_default">1</property>
               </object>
             </child>
             <child>
               <object class="GtkButton" id="button15">
                 <property name="label" translatable="yes">button</property>
-                <property name="visible">True</property>
-                <property name="can_focus">True</property>
-                <property name="receives_default">True</property>
+                <property name="can_focus">1</property>
+                <property name="receives_default">1</property>
               </object>
             </child>
           </object>
         </child>
         <child>
           <object class="GtkBox" id="box5">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="orientation">vertical</property>
             <child>
               <object class="GtkButton" id="button6">
                 <property name="label" translatable="yes">button</property>
-                <property name="visible">True</property>
-                <property name="can_focus">True</property>
-                <property name="receives_default">True</property>
+                <property name="can_focus">1</property>
+                <property name="receives_default">1</property>
               </object>
             </child>
             <child>
               <object class="GtkButton" id="button11">
                 <property name="label" translatable="yes">button</property>
-                <property name="visible">True</property>
-                <property name="can_focus">True</property>
-                <property name="receives_default">True</property>
+                <property name="can_focus">1</property>
+                <property name="receives_default">1</property>
               </object>
             </child>
           </object>
         </child>
         <child>
           <object class="GtkBox" id="box6">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="orientation">vertical</property>
             <child>
               <object class="GtkButton" id="button12">
                 <property name="label" translatable="yes">button</property>
-                <property name="visible">True</property>
-                <property name="can_focus">True</property>
-                <property name="receives_default">True</property>
+                <property name="can_focus">1</property>
+                <property name="receives_default">1</property>
               </object>
             </child>
           </object>

diff --git a/testsuite/reftests/box-shadow-changes-modify-clip.ref.ui b/testsuite/reftests/box-shadow-changes-modify-clip.ref.ui
index 42a62bc25054b5c430e9862792adfd4c57ae5251..c18d74d7e650b72d50242520686d8fa9efca15cf 100644 (file)
--- a/testsuite/reftests/box-shadow-changes-modify-clip.ref.ui
+++ b/testsuite/reftests/box-shadow-changes-modify-clip.ref.ui
@@ -1,16 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!-- Generated with glade 3.18.1 -->
 <interface>
   <requires lib="gtk+" version="3.12"/>
   <object class="GtkWindow" id="window1">
     <property name="width_request">500</property>
     <property name="height_request">100</property>
-    <property name="can_focus">False</property>
     <property name="type">popup</property>
     <child>
       <object class="GtkLabel" id="label1">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
         <property name="halign">center</property>
         <property name="valign">center</property>
         <property name="label" translatable="yes">Hello World</property>

diff --git a/testsuite/reftests/box-shadow-changes-modify-clip.ui b/testsuite/reftests/box-shadow-changes-modify-clip.ui
index bb34bb001ee0dc9aa0cc23bc7535204f12ad7f4f..f69a6905604364b55ad3a4f02d2faaea6ffc35ff 100644 (file)
--- a/testsuite/reftests/box-shadow-changes-modify-clip.ui
+++ b/testsuite/reftests/box-shadow-changes-modify-clip.ui
@@ -1,24 +1,18 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!-- Generated with glade 3.18.1 -->
 <interface>
   <requires lib="gtk+" version="3.12"/>
   <object class="GtkWindow" id="window1">
     <property name="width_request">500</property>
     <property name="height_request">100</property>
-    <property name="can_focus">False</property>
     <property name="type">popup</property>
     <signal name="map" handler="reftest:inhibit_for_3_frames" swapped="no"/>
     <child>
       <object class="GtkBox" id="box2">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
         <property name="halign">center</property>
         <property name="valign">center</property>
         <property name="orientation">vertical</property>
         <child>
           <object class="GtkLabel" id="label1">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="label" translatable="yes">Hello World</property>
             <signal name="map" handler="reftest:add_reference_class_if_no_animation" swapped="no"/>
           </object>

diff --git a/testsuite/reftests/box-shadow-spec-inset.ref.ui b/testsuite/reftests/box-shadow-spec-inset.ref.ui
index 5b67f2981ec9d6b9921a0b9b65e632e9fd2c9bff..9441593c480ceeeae94d39a671be6ccd4a37e849 100644 (file)
--- a/testsuite/reftests/box-shadow-spec-inset.ref.ui
+++ b/testsuite/reftests/box-shadow-spec-inset.ref.ui
@@ -1,328 +1,284 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
-  <!-- interface-requires gtk+ 3.0 -->
   <object class="GtkWindow" id="window1">
-    <property name="can_focus">False</property>
     <property name="type">popup</property>
     <child>
       <object class="GtkGrid" id="grid1">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
         <property name="row_spacing">20</property>
         <property name="column_spacing">20</property>
         <child>
           <object class="GtkButton" id="widget-1-1">
             <property name="width_request">144</property>
             <property name="height_request">144</property>
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <style>
-              <class name="reference-border" />
-              <class name="reference-background" />
-              <class name="column1" />
+              <class name="reference-border"/>
+              <class name="reference-background"/>
+              <class name="column1"/>
             </style>
+            <layout>
+              <property name="left_attach">0</property>
+              <property name="top_attach">0</property>
+              <property name="column-span">1</property>
+              <property name="row-span">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">0</property>
-            <property name="top_attach">0</property>
-            <property name="width">1</property>
-            <property name="height">1</property>
-          </packing>
         </child>
         <child>
           <object class="GtkButton" id="widget-1-2">
             <property name="width_request">144</property>
             <property name="height_request">144</property>
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <style>
-              <class name="reference-border" />
-              <class name="reference-background" />
-              <class name="column2" />
+              <class name="reference-border"/>
+              <class name="reference-background"/>
+              <class name="column2"/>
             </style>
+            <layout>
+              <property name="left_attach">1</property>
+              <property name="top_attach">0</property>
+              <property name="column-span">1</property>
+              <property name="row-span">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">1</property>
-            <property name="top_attach">0</property>
-            <property name="width">1</property>
-            <property name="height">1</property>
-          </packing>
         </child>
         <child>
           <object class="GtkFixed" id="widget-2-1">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <child>
               <object class="GtkButton" id="widget-2-1-1">
                 <property name="width_request">144</property>
                 <property name="height_request">144</property>
-                <property name="visible">True</property>
-                <property name="can_focus">False</property>
                 <style>
-                  <class name="reference-background" />
-                  <class name="column1" />
+                  <class name="reference-background"/>
+                  <class name="column1"/>
                 </style>
+                <layout>
+                  <property name="x">0</property>
+                  <property name="y">0</property>
+                </layout>
               </object>
-              <packing>
-                <property name="x">0</property>
-                <property name="y">0</property>
-              </packing>
             </child>
             <child>
               <object class="GtkButton" id="widget-2-1-2">
                 <property name="width_request">134</property>
                 <property name="height_request">134</property>
-                <property name="visible">True</property>
-                <property name="can_focus">False</property>
                 <style>
-                  <class name="reference-shadow" />
-                  <class name="reference-padding-radius" />
+                  <class name="reference-shadow"/>
+                  <class name="reference-padding-radius"/>
                 </style>
+                <layout>
+                  <property name="x">5</property>
+                  <property name="y">5</property>
+                </layout>
               </object>
-              <packing>
-                <property name="x">5</property>
-                <property name="y">5</property>
-              </packing>
             </child>
             <child>
               <object class="GtkButton" id="widget-2-1-3">
                 <property name="width_request">119</property>
                 <property name="height_request">119</property>
-                <property name="visible">True</property>
-                <property name="can_focus">False</property>
                 <style>
-                  <class name="reference-background" />
-                  <class name="reference-radii1" />
-                  <class name="column1" />
+                  <class name="reference-background"/>
+                  <class name="reference-radii1"/>
+                  <class name="column1"/>
                 </style>
+                <layout>
+                  <property name="x">20</property>
+                  <property name="y">20</property>
+                </layout>
               </object>
-              <packing>
-                <property name="x">20</property>
-                <property name="y">20</property>
-              </packing>
             </child>
             <child>
               <object class="GtkButton" id="widget-2-1-4">
                 <property name="width_request">144</property>
                 <property name="height_request">144</property>
-                <property name="visible">True</property>
-                <property name="can_focus">False</property>
                 <style>
-                  <class name="reference-border" />
-                  <class name="column1" />
+                  <class name="reference-border"/>
+                  <class name="column1"/>
                 </style>
+                <layout>
+                  <property name="x">0</property>
+                  <property name="y">0</property>
+                </layout>
               </object>
-              <packing>
-                <property name="x">0</property>
-                <property name="y">0</property>
-              </packing>
             </child>
+            <layout>
+              <property name="left_attach">0</property>
+              <property name="top_attach">1</property>
+              <property name="column-span">1</property>
+              <property name="row-span">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">0</property>
-            <property name="top_attach">1</property>
-            <property name="width">1</property>
-            <property name="height">1</property>
-          </packing>
         </child>
         <child>
           <object class="GtkFixed" id="widget-2-2">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <child>
               <object class="GtkButton" id="widget-2-2-1">
                 <property name="width_request">144</property>
                 <property name="height_request">144</property>
-                <property name="visible">True</property>
-                <property name="can_focus">False</property>
                 <style>
-                  <class name="reference-border" />
-                  <class name="reference-background" />
-                  <class name="column2" />
+                  <class name="reference-border"/>
+                  <class name="reference-background"/>
+                  <class name="column2"/>
                 </style>
+                <layout>
+                  <property name="x">0</property>
+                  <property name="y">0</property>
+                </layout>
               </object>
-              <packing>
-                <property name="x">0</property>
-                <property name="y">0</property>
-              </packing>
             </child>
             <child>
               <object class="GtkButton" id="widget-2-2-2">
                 <property name="width_request">134</property>
                 <property name="height_request">134</property>
-                <property name="visible">True</property>
-                <property name="can_focus">False</property>
                 <style>
-                  <class name="reference-shadow" />
-                  <class name="column2" />
+                  <class name="reference-shadow"/>
+                  <class name="column2"/>
                 </style>
+                <layout>
+                  <property name="x">5</property>
+                  <property name="y">5</property>
+                </layout>
               </object>
-              <packing>
-                <property name="x">5</property>
-                <property name="y">5</property>
-              </packing>
             </child>
             <child>
               <object class="GtkButton" id="widget-2-2-3">
                 <property name="width_request">119</property>
                 <property name="height_request">119</property>
-                <property name="visible">True</property>
-                <property name="can_focus">False</property>
                 <style>
-                  <class name="reference-background" />
-                  <class name="column2" />
+                  <class name="reference-background"/>
+                  <class name="column2"/>
                 </style>
+                <layout>
+                  <property name="x">20</property>
+                  <property name="y">20</property>
+                </layout>
               </object>
-              <packing>
-                <property name="x">20</property>
-                <property name="y">20</property>
-              </packing>
             </child>
+            <layout>
+              <property name="left_attach">1</property>
+              <property name="top_attach">1</property>
+              <property name="column-span">1</property>
+              <property name="row-span">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">1</property>
-            <property name="top_attach">1</property>
-            <property name="width">1</property>
-            <property name="height">1</property>
-          </packing>
         </child>
         <child>
           <object class="GtkFixed" id="widget-3-1">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <child>
               <object class="GtkButton" id="widget-3-1-1">
                 <property name="width_request">144</property>
                 <property name="height_request">144</property>
-                <property name="visible">True</property>
-                <property name="can_focus">False</property>
                 <style>
-                  <class name="reference-background" />
-                  <class name="column1" />
+                  <class name="reference-background"/>
+                  <class name="column1"/>
                 </style>
+                <layout>
+                  <property name="x">0</property>
+                  <property name="y">0</property>
+                </layout>
               </object>
-              <packing>
-                <property name="x">0</property>
-                <property name="y">0</property>
-              </packing>
             </child>
             <child>
               <object class="GtkButton" id="widget-3-1-2">
                 <property name="width_request">134</property>
                 <property name="height_request">134</property>
-                <property name="visible">True</property>
-                <property name="can_focus">False</property>
                 <style>
-                  <class name="reference-shadow" />
-                  <class name="reference-padding-radius" />
+                  <class name="reference-shadow"/>
+                  <class name="reference-padding-radius"/>
                 </style>
+                <layout>
+                  <property name="x">5</property>
+                  <property name="y">5</property>
+                </layout>
               </object>
-              <packing>
-                <property name="x">5</property>
-                <property name="y">5</property>
-              </packing>
             </child>
             <child>
               <object class="GtkButton" id="widget-3-1-3">
                 <property name="width_request">109</property>
                 <property name="height_request">109</property>
-                <property name="visible">True</property>
-                <property name="can_focus">False</property>
                 <style>
-                  <class name="reference-background" />
-                  <class name="reference-radii2" />
-                  <class name="column1" />
+                  <class name="reference-background"/>
+                  <class name="reference-radii2"/>
+                  <class name="column1"/>
                 </style>
+                <layout>
+                  <property name="x">30</property>
+                  <property name="y">30</property>
+                </layout>
               </object>
-              <packing>
-                <property name="x">30</property>
-                <property name="y">30</property>
-              </packing>
             </child>
             <child>
               <object class="GtkButton" id="widget-3-1-4">
                 <property name="width_request">144</property>
                 <property name="height_request">144</property>
-                <property name="visible">True</property>
-                <property name="can_focus">False</property>
                 <style>
-                  <class name="reference-border" />
-                  <class name="column1" />
+                  <class name="reference-border"/>
+                  <class name="column1"/>
                 </style>
+                <layout>
+                  <property name="x">0</property>
+                  <property name="y">0</property>
+                </layout>
               </object>
-              <packing>
-                <property name="x">0</property>
-                <property name="y">0</property>
-              </packing>
             </child>
+            <layout>
+              <property name="left_attach">0</property>
+              <property name="top_attach">2</property>
+              <property name="column-span">1</property>
+              <property name="row-span">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">0</property>
-            <property name="top_attach">2</property>
-            <property name="width">1</property>
-            <property name="height">1</property>
-          </packing>
         </child>
         <child>
           <object class="GtkFixed" id="widget-3-2">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <child>
               <object class="GtkButton" id="widget-3-2-1">
                 <property name="width_request">144</property>
                 <property name="height_request">144</property>
-                <property name="visible">True</property>
-                <property name="can_focus">False</property>
                 <style>
-                  <class name="reference-border" />
-                  <class name="reference-background" />
-                  <class name="column2" />
+                  <class name="reference-border"/>
+                  <class name="reference-background"/>
+                  <class name="column2"/>
                 </style>
+                <layout>
+                  <property name="x">0</property>
+                  <property name="y">0</property>
+                </layout>
               </object>
-              <packing>
-                <property name="x">0</property>
-                <property name="y">0</property>
-              </packing>
             </child>
             <child>
               <object class="GtkButton" id="widget-3-2-2">
                 <property name="width_request">134</property>
                 <property name="height_request">134</property>
-                <property name="visible">True</property>
-                <property name="can_focus">False</property>
                 <style>
-                  <class name="reference-shadow" />
-                  <class name="column2" />
+                  <class name="reference-shadow"/>
+                  <class name="column2"/>
                 </style>
+                <layout>
+                  <property name="x">5</property>
+                  <property name="y">5</property>
+                </layout>
               </object>
-              <packing>
-                <property name="x">5</property>
-                <property name="y">5</property>
-              </packing>
             </child>
             <child>
               <object class="GtkButton" id="widget-3-2-3">
                 <property name="width_request">109</property>
                 <property name="height_request">109</property>
-                <property name="visible">True</property>
-                <property name="can_focus">False</property>
                 <style>
-                  <class name="reference-background" />
-                  <class name="column2" />
+                  <class name="reference-background"/>
+                  <class name="column2"/>
                 </style>
+                <layout>
+                  <property name="x">30</property>
+                  <property name="y">30</property>
+                </layout>
               </object>
-              <packing>
-                <property name="x">30</property>
-                <property name="y">30</property>
-              </packing>
             </child>
+            <layout>
+              <property name="left_attach">1</property>
+              <property name="top_attach">2</property>
+              <property name="column-span">1</property>
+              <property name="row-span">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">1</property>
-            <property name="top_attach">2</property>
-            <property name="width">1</property>
-            <property name="height">1</property>
-          </packing>
         </child>
       </object>
     </child>

diff --git a/testsuite/reftests/box-shadow-spec-inset.ui b/testsuite/reftests/box-shadow-spec-inset.ui
index 87eedde40ace8e5e3f62249a2a87c2df5a7db349..3d38e4d42dac4913029d4cb8cc0b411ab14a4b07 100644 (file)
--- a/testsuite/reftests/box-shadow-spec-inset.ui
+++ b/testsuite/reftests/box-shadow-spec-inset.ui
@@ -1,122 +1,106 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
-  <!-- interface-requires gtk+ 3.0 -->
   <object class="GtkWindow" id="window1">
-    <property name="can_focus">False</property>
     <property name="type">popup</property>
     <child>
       <object class="GtkGrid" id="grid1">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
         <property name="row_spacing">20</property>
         <property name="column_spacing">20</property>
         <child>
           <object class="GtkButton" id="widget-1-1">
             <property name="width_request">144</property>
             <property name="height_request">144</property>
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <style>
-              <class name="column1" />
-              <class name="row1" />
+              <class name="column1"/>
+              <class name="row1"/>
             </style>
+            <layout>
+              <property name="left_attach">1</property>
+              <property name="top_attach">1</property>
+              <property name="column-span">1</property>
+              <property name="row-span">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">1</property>
-            <property name="top_attach">1</property>
-            <property name="width">1</property>
-            <property name="height">1</property>
-          </packing>
         </child>
         <child>
           <object class="GtkButton" id="widget-1-2">
             <property name="width_request">144</property>
             <property name="height_request">144</property>
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <style>
-              <class name="column1" />
-              <class name="row2" />
+              <class name="column1"/>
+              <class name="row2"/>
             </style>
+            <layout>
+              <property name="left_attach">1</property>
+              <property name="top_attach">2</property>
+              <property name="column-span">1</property>
+              <property name="row-span">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">1</property>
-            <property name="top_attach">2</property>
-            <property name="width">1</property>
-            <property name="height">1</property>
-          </packing>
         </child>
         <child>
           <object class="GtkButton" id="widget-1-3">
             <property name="width_request">144</property>
             <property name="height_request">144</property>
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <style>
-              <class name="column1" />
-              <class name="row3" />
+              <class name="column1"/>
+              <class name="row3"/>
             </style>
+            <layout>
+              <property name="left_attach">1</property>
+              <property name="top_attach">3</property>
+              <property name="column-span">1</property>
+              <property name="row-span">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">1</property>
-            <property name="top_attach">3</property>
-            <property name="width">1</property>
-            <property name="height">1</property>
-          </packing>
         </child>
         <child>
           <object class="GtkButton" id="widget-2-1">
             <property name="width_request">144</property>
             <property name="height_request">144</property>
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <style>
-              <class name="column2" />
-              <class name="row1" />
+              <class name="column2"/>
+              <class name="row1"/>
             </style>
+            <layout>
+              <property name="left_attach">2</property>
+              <property name="top_attach">1</property>
+              <property name="column-span">1</property>
+              <property name="row-span">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">2</property>
-            <property name="top_attach">1</property>
-            <property name="width">1</property>
-            <property name="height">1</property>
-          </packing>
         </child>
         <child>
           <object class="GtkButton" id="widget-2-2">
             <property name="width_request">144</property>
             <property name="height_request">144</property>
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <style>
-              <class name="column2" />
-              <class name="row2" />
+              <class name="column2"/>
+              <class name="row2"/>
             </style>
+            <layout>
+              <property name="left_attach">2</property>
+              <property name="top_attach">2</property>
+              <property name="column-span">1</property>
+              <property name="row-span">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">2</property>
-            <property name="top_attach">2</property>
-            <property name="width">1</property>
-            <property name="height">1</property>
-          </packing>
         </child>
         <child>
           <object class="GtkButton" id="widget-2-3">
             <property name="width_request">144</property>
             <property name="height_request">144</property>
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <style>
-              <class name="column2" />
-              <class name="row3" />
+              <class name="column2"/>
+              <class name="row3"/>
             </style>
+            <layout>
+              <property name="left_attach">2</property>
+              <property name="top_attach">3</property>
+              <property name="column-span">1</property>
+              <property name="row-span">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">2</property>
-            <property name="top_attach">3</property>
-            <property name="width">1</property>
-            <property name="height">1</property>
-          </packing>
         </child>
       </object>
     </child>

diff --git a/testsuite/reftests/box-shadow-spread.ref.ui b/testsuite/reftests/box-shadow-spread.ref.ui
index f6894c2b34edb7622842df0e9fdce69bff9cdc69..826a0dde37f665f428a6e4542ee089ade93465d9 100644 (file)
--- a/testsuite/reftests/box-shadow-spread.ref.ui
+++ b/testsuite/reftests/box-shadow-spread.ref.ui
@@ -1,18 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!-- Generated with glade 3.18.1 -->
 <interface>
   <requires lib="gtk+" version="3.12"/>
   <object class="GtkWindow" id="window1">
     <property name="width_request">100</property>
     <property name="height_request">100</property>
-    <property name="can_focus">False</property>
     <property name="type">popup</property>
     <child>
       <object class="GtkButton" id="button1">
         <property name="label" translatable="yes">Hi</property>
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
-        <property name="receives_default">False</property>
         <property name="halign">center</property>
         <property name="valign">center</property>
         <style>

diff --git a/testsuite/reftests/box-shadow-spread.ui b/testsuite/reftests/box-shadow-spread.ui
index ef4cdea031e1a82e38cb14c5eb995a56f3b3a587..9a7384a6a19532a6a3d86c7e046e637483acb04e 100644 (file)
--- a/testsuite/reftests/box-shadow-spread.ui
+++ b/testsuite/reftests/box-shadow-spread.ui
@@ -1,18 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!-- Generated with glade 3.18.1 -->
 <interface>
   <requires lib="gtk+" version="3.12"/>
   <object class="GtkWindow" id="window1">
     <property name="width_request">100</property>
     <property name="height_request">100</property>
-    <property name="can_focus">False</property>
     <property name="type">popup</property>
     <child>
       <object class="GtkButton" id="button1">
         <property name="label" translatable="yes">Hi</property>
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
-        <property name="receives_default">False</property>
         <property name="halign">center</property>
         <property name="valign">center</property>
         <style>

diff --git a/testsuite/reftests/box-shadow-with-blend-mode.ref.ui b/testsuite/reftests/box-shadow-with-blend-mode.ref.ui
index 80d7e50d458b797248e10ecb75603d3fe634aa60..6e8166620542f5385aff5f0366bef6d56a600b10 100644 (file)
--- a/testsuite/reftests/box-shadow-with-blend-mode.ref.ui
+++ b/testsuite/reftests/box-shadow-with-blend-mode.ref.ui
@@ -1,17 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!-- Generated with glade 3.19.0 -->
 <interface>
   <requires lib="gtk+" version="3.16"/>
   <object class="GtkWindow" id="window1">
-    <property name="can_focus">False</property>
     <property name="type">popup</property>
     <child>
       <object class="GtkButton" id="b">
         <property name="name">reference</property>
         <property name="label" translatable="yes">Hello World!</property>
-        <property name="visible">True</property>
-        <property name="can_focus">True</property>
-        <property name="receives_default">True</property>
+        <property name="can_focus">1</property>
+        <property name="receives_default">1</property>
       </object>
     </child>
   </object>

diff --git a/testsuite/reftests/box-shadow-with-blend-mode.ui b/testsuite/reftests/box-shadow-with-blend-mode.ui
index 1e5b7cc9fb58b23695dc61d33f416bc1e3f54025..0926699a8cde4cc28b61387a7119cb6ba2e00ba4 100644 (file)
--- a/testsuite/reftests/box-shadow-with-blend-mode.ui
+++ b/testsuite/reftests/box-shadow-with-blend-mode.ui
@@ -1,16 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!-- Generated with glade 3.19.0 -->
 <interface>
   <requires lib="gtk+" version="3.16"/>
   <object class="GtkWindow" id="window1">
-    <property name="can_focus">False</property>
     <property name="type">popup</property>
     <child>
       <object class="GtkButton" id="b">
         <property name="label" translatable="yes">Hello World!</property>
-        <property name="visible">True</property>
-        <property name="can_focus">True</property>
-        <property name="receives_default">True</property>
+        <property name="can_focus">1</property>
+        <property name="receives_default">1</property>
       </object>
     </child>
   </object>

diff --git a/testsuite/reftests/button-wrapping.ref.ui b/testsuite/reftests/button-wrapping.ref.ui
index 007f26fbcdd4eaab467568341981429cb7b6451e..44dc22f0cba2874bf7ceba41f1bb95f58fecf26d 100644 (file)
--- a/testsuite/reftests/button-wrapping.ref.ui
+++ b/testsuite/reftests/button-wrapping.ref.ui
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
 <interface>
   <object class="GtkWindow" id="window1">
     <property name="height_request">500</property>
@@ -8,10 +9,8 @@
         <property name="orientation">vertical</property>
         <child>
           <object class="GtkPaned" id="paned1">
-            <property name="shrink-child2">True</property>
-            <property name="resize-child2">True</property>
-            <property name="shrink-child1">False</property>
-            <property name="resize-child1">False</property>
+            <property name="shrink-child1">0</property>
+            <property name="resize-child1">0</property>
             <property name="can_focus">1</property>
             <property name="position_set">1</property>
             <child>
@@ -37,10 +36,8 @@ World</property>
         </child>
         <child>
           <object class="GtkPaned" id="paned2">
-            <property name="shrink-child2">True</property>
-            <property name="resize-child2">True</property>
-            <property name="shrink-child1">False</property>
-            <property name="resize-child1">False</property>
+            <property name="shrink-child1">0</property>
+            <property name="resize-child1">0</property>
             <property name="can_focus">1</property>
             <property name="position_set">1</property>
             <child>
@@ -67,10 +64,8 @@ World</property>
         </child>
         <child>
           <object class="GtkPaned" id="paned3">
-            <property name="shrink-child2">True</property>
-            <property name="resize-child2">True</property>
-            <property name="shrink-child1">False</property>
-            <property name="resize-child1">False</property>
+            <property name="shrink-child1">0</property>
+            <property name="resize-child1">0</property>
             <property name="can_focus">1</property>
             <property name="position_set">1</property>
             <child>
@@ -97,10 +92,8 @@ World</property>
         </child>
         <child>
           <object class="GtkPaned" id="paned4">
-            <property name="shrink-child2">True</property>
-            <property name="resize-child2">True</property>
-            <property name="shrink-child1">False</property>
-            <property name="resize-child1">False</property>
+            <property name="shrink-child1">0</property>
+            <property name="resize-child1">0</property>
             <property name="can_focus">1</property>
             <property name="position_set">1</property>
             <child>

diff --git a/testsuite/reftests/button-wrapping.ui b/testsuite/reftests/button-wrapping.ui
index dbe5a7a542bb0537c8ba643c0df56050a7e03431..9e661049842fda0a8d2f4fb77ed481109dec945d 100644 (file)
--- a/testsuite/reftests/button-wrapping.ui
+++ b/testsuite/reftests/button-wrapping.ui
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
 <interface>
   <object class="GtkWindow" id="window1">
     <property name="height_request">500</property>
@@ -8,10 +9,8 @@
         <property name="orientation">vertical</property>
         <child>
           <object class="GtkPaned" id="paned1">
-            <property name="shrink-child2">True</property>
-            <property name="resize-child2">True</property>
-            <property name="shrink-child1">False</property>
-            <property name="resize-child1">False</property>
+            <property name="shrink-child1">0</property>
+            <property name="resize-child1">0</property>
             <property name="can_focus">1</property>
             <property name="position_set">1</property>
             <child>
@@ -37,10 +36,8 @@
         </child>
         <child>
           <object class="GtkPaned" id="paned2">
-            <property name="shrink-child2">True</property>
-            <property name="resize-child2">True</property>
-            <property name="shrink-child1">False</property>
-            <property name="resize-child1">False</property>
+            <property name="shrink-child1">0</property>
+            <property name="resize-child1">0</property>
             <property name="can_focus">1</property>
             <property name="position_set">1</property>
             <child>
@@ -67,10 +64,8 @@
         </child>
         <child>
           <object class="GtkPaned" id="paned3">
-            <property name="shrink-child2">True</property>
-            <property name="resize-child2">True</property>
-            <property name="shrink-child1">False</property>
-            <property name="resize-child1">False</property>
+            <property name="shrink-child1">0</property>
+            <property name="resize-child1">0</property>
             <property name="can_focus">1</property>
             <property name="position_set">1</property>
             <child>
@@ -97,10 +92,8 @@
         </child>
         <child>
           <object class="GtkPaned" id="paned4">
-            <property name="shrink-child2">True</property>
-            <property name="resize-child2">True</property>
-            <property name="shrink-child1">False</property>
-            <property name="resize-child1">False</property>
+            <property name="shrink-child1">0</property>
+            <property name="resize-child1">0</property>
             <property name="can_focus">1</property>
             <property name="position_set">1</property>
             <child>

diff --git a/testsuite/reftests/color-transition.ref.ui b/testsuite/reftests/color-transition.ref.ui
index fa283509062e6dcd1cc6b89ee5638dd0259e66e2..331350ef6d215c5bd70dfe51007535192f1caa79 100644 (file)
--- a/testsuite/reftests/color-transition.ref.ui
+++ b/testsuite/reftests/color-transition.ref.ui
@@ -1,8 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
-  <!-- interface-requires gtk+ 3.0 -->
   <object class="GtkWindow" id="window1">
-    <property name="can_focus">False</property>
     <property name="type">popup</property>
   </object>
 </interface>

diff --git a/testsuite/reftests/color-transition.ui b/testsuite/reftests/color-transition.ui
index 47e01cb600423a3400f3024db3e9493f7ea4804e..715d42c7710415c70843bd1162d4f3c70f601c0a 100644 (file)
--- a/testsuite/reftests/color-transition.ui
+++ b/testsuite/reftests/color-transition.ui
@@ -1,19 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
-  <!-- interface-requires gtk+ 3.0 -->
   <object class="GtkWindow" id="window1">
-    <property name="can_focus">False</property>
     <property name="type">popup</property>
     <child>
       <object class="GtkBox" id="box1">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
         <child>
           <object class="GtkBox" id="box2">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
-            <property name="hexpand">True</property>
-            <property name="vexpand">True</property>
+            <property name="hexpand">1</property>
+            <property name="vexpand">1</property>
             <child>
               <placeholder/>
             </child>

diff --git a/testsuite/reftests/css-currentcolor-alpha.ref.ui b/testsuite/reftests/css-currentcolor-alpha.ref.ui
index 9d475c3aaa37f92e03bb5b82e90c2447dd2b2b2f..5cb0e82ca66e1c2a73347d9f040a99c8c204b455 100644 (file)
--- a/testsuite/reftests/css-currentcolor-alpha.ref.ui
+++ b/testsuite/reftests/css-currentcolor-alpha.ref.ui
@@ -1,8 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
-  <!-- interface-requires gtk+ 3.0 -->
   <object class="GtkWindow" id="window1">
-    <property name="can_focus">False</property>
     <property name="type">popup</property>
     <property name="name">reference</property>
     <child>

diff --git a/testsuite/reftests/css-currentcolor-alpha.ui b/testsuite/reftests/css-currentcolor-alpha.ui
index 51595c789484dd43447aff79b36305030a89ace8..ec70764dc34cb9ff331912fa538102cff3299070 100644 (file)
--- a/testsuite/reftests/css-currentcolor-alpha.ui
+++ b/testsuite/reftests/css-currentcolor-alpha.ui
@@ -1,8 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
-  <!-- interface-requires gtk+ 3.0 -->
   <object class="GtkWindow" id="window1">
-    <property name="can_focus">False</property>
     <property name="type">popup</property>
     <child>
       <placeholder/>

diff --git a/testsuite/reftests/css-em-label-size.ref.ui b/testsuite/reftests/css-em-label-size.ref.ui
index 6c1ea128e7e7fd079421b2c1162c9b96be50be0e..8dbfeb4d761e96bc1b181158f5fb30e17f914ee6 100644 (file)
--- a/testsuite/reftests/css-em-label-size.ref.ui
+++ b/testsuite/reftests/css-em-label-size.ref.ui
@@ -1,310 +1,250 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!-- Generated with glade 3.20.0 -->
 <interface>
   <requires lib="gtk+" version="3.20"/>
   <object class="GtkWindow">
-    <property name="can_focus">False</property>
     <property name="type">popup</property>
     <child>
       <object class="GtkGrid">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
-        <property name="row_homogeneous">True</property>
-        <property name="width-request">300></property>
+        <property name="row_homogeneous">1</property>
+        <property name="width-request">300&gt;</property>
         <child>
           <object class="GtkLabel">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="label" translatable="yes">px</property>
-            <property name="height-request">100></property>
+            <property name="height-request">100&gt;</property>
+            <layout>
+              <property name="left_attach">0</property>
+              <property name="top_attach">0</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">0</property>
-            <property name="top_attach">0</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="label" translatable="yes">pt</property>
+            <layout>
+              <property name="left_attach">0</property>
+              <property name="top_attach">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">0</property>
-            <property name="top_attach">1</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="label" translatable="yes">in</property>
+            <layout>
+              <property name="left_attach">0</property>
+              <property name="top_attach">2</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">0</property>
-            <property name="top_attach">2</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="label" translatable="yes">cm</property>
+            <layout>
+              <property name="left_attach">0</property>
+              <property name="top_attach">3</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">0</property>
-            <property name="top_attach">3</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="label" translatable="yes">mm</property>
+            <layout>
+              <property name="left_attach">0</property>
+              <property name="top_attach">4</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">0</property>
-            <property name="top_attach">4</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="label" translatable="yes">em</property>
+            <layout>
+              <property name="left_attach">0</property>
+              <property name="top_attach">5</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">0</property>
-            <property name="top_attach">5</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="label" translatable="yes">ex</property>
+            <layout>
+              <property name="left_attach">0</property>
+              <property name="top_attach">6</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">0</property>
-            <property name="top_attach">6</property>
-          </packing>
         </child>
         <child>
           <object class="GtkBox" id="px-box">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <child>
               <object class="GtkLabel">
-                <property name="visible">True</property>
-                <property name="can_focus">False</property>
                 <property name="label" translatable="yes">███</property>
                 <attributes>
-                  <attribute name="font-desc" value="12px"/>
+                  <attribute name="font-desc" value="12px"></attribute>
                 </attributes>
               </object>
             </child>
             <child>
               <object class="GtkLabel">
-                <property name="visible">True</property>
-                <property name="can_focus">False</property>
                 <property name="label" translatable="yes">███</property>
                 <attributes>
-                  <attribute name="font-desc" value="12px"/>
-                  <attribute name="foreground" value="red"/>
+                  <attribute name="font-desc" value="12px"></attribute>
+                  <attribute name="foreground" value="red"></attribute>
                 </attributes>
               </object>
             </child>
+            <layout>
+              <property name="left_attach">1</property>
+              <property name="top_attach">0</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">1</property>
-            <property name="top_attach">0</property>
-          </packing>
         </child>
         <child>
           <object class="GtkBox" id="pt-box">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <child>
               <object class="GtkLabel">
-                <property name="visible">True</property>
-                <property name="can_focus">False</property>
                 <property name="label" translatable="yes">███</property>
                 <attributes>
-                  <attribute name="font-desc" value="16px"/>
+                  <attribute name="font-desc" value="16px"></attribute>
                 </attributes>
               </object>
             </child>
             <child>
               <object class="GtkLabel">
-                <property name="visible">True</property>
-                <property name="can_focus">False</property>
                 <property name="label" translatable="yes">███</property>
                 <attributes>
-                  <attribute name="font-desc" value="16px"/>
-                  <attribute name="foreground" value="red"/>
+                  <attribute name="font-desc" value="16px"></attribute>
+                  <attribute name="foreground" value="red"></attribute>
                 </attributes>
               </object>
             </child>
+            <layout>
+              <property name="left_attach">1</property>
+              <property name="top_attach">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">1</property>
-            <property name="top_attach">1</property>
-          </packing>
         </child>
         <child>
           <object class="GtkBox" id="in-box">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <child>
               <object class="GtkLabel">
-                <property name="visible">True</property>
-                <property name="can_focus">False</property>
                 <property name="label" translatable="yes">███</property>
                 <attributes>
-                  <attribute name="font-desc" value="24px"/>
+                  <attribute name="font-desc" value="24px"></attribute>
                 </attributes>
               </object>
             </child>
             <child>
               <object class="GtkLabel">
-                <property name="visible">True</property>
-                <property name="can_focus">False</property>
                 <property name="label" translatable="yes">███</property>
                 <attributes>
-                  <attribute name="font-desc" value="24px"/>
-                  <attribute name="foreground" value="red"/>
+                  <attribute name="font-desc" value="24px"></attribute>
+                  <attribute name="foreground" value="red"></attribute>
                 </attributes>
               </object>
             </child>
+            <layout>
+              <property name="left_attach">1</property>
+              <property name="top_attach">2</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">1</property>
-            <property name="top_attach">2</property>
-          </packing>
         </child>
         <child>
           <object class="GtkBox" id="cm-box">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <child>
               <object class="GtkLabel">
-                <property name="visible">True</property>
-                <property name="can_focus">False</property>
                 <property name="label" translatable="yes">███</property>
                 <attributes>
-                  <attribute name="font-desc" value="24px"/>
+                  <attribute name="font-desc" value="24px"></attribute>
                 </attributes>
               </object>
             </child>
             <child>
               <object class="GtkLabel">
-                <property name="visible">True</property>
-                <property name="can_focus">False</property>
                 <property name="label" translatable="yes">███</property>
                 <attributes>
-                  <attribute name="font-desc" value="24px"/>
-                  <attribute name="foreground" value="red"/>
+                  <attribute name="font-desc" value="24px"></attribute>
+                  <attribute name="foreground" value="red"></attribute>
                 </attributes>
               </object>
             </child>
+            <layout>
+              <property name="left_attach">1</property>
+              <property name="top_attach">3</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">1</property>
-            <property name="top_attach">3</property>
-          </packing>
         </child>
         <child>
           <object class="GtkBox" id="mm-box">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <child>
               <object class="GtkLabel">
-                <property name="visible">True</property>
-                <property name="can_focus">False</property>
                 <property name="label" translatable="yes">███</property>
                 <attributes>
-                  <attribute name="font-desc" value="24px"/>
+                  <attribute name="font-desc" value="24px"></attribute>
                 </attributes>
               </object>
             </child>
             <child>
               <object class="GtkLabel">
-                <property name="visible">True</property>
-                <property name="can_focus">False</property>
                 <property name="label" translatable="yes">███</property>
                 <attributes>
-                  <attribute name="font-desc" value="24px"/>
-                  <attribute name="foreground" value="red"/>
+                  <attribute name="font-desc" value="24px"></attribute>
+                  <attribute name="foreground" value="red"></attribute>
                 </attributes>
               </object>
             </child>
+            <layout>
+              <property name="left_attach">1</property>
+              <property name="top_attach">4</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">1</property>
-            <property name="top_attach">4</property>
-          </packing>
         </child>
         <child>
           <object class="GtkBox" id="em-box">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <child>
               <object class="GtkLabel">
-                <property name="visible">True</property>
-                <property name="can_focus">False</property>
                 <property name="label" translatable="yes">███</property>
                 <attributes>
-                  <attribute name="font-desc" value="18px"/>
+                  <attribute name="font-desc" value="18px"></attribute>
                 </attributes>
               </object>
             </child>
             <child>
               <object class="GtkLabel">
-                <property name="visible">True</property>
-                <property name="can_focus">False</property>
                 <property name="label" translatable="yes">███</property>
                 <attributes>
-                  <attribute name="font-desc" value="18px"/>
-                  <attribute name="foreground" value="red"/>
+                  <attribute name="font-desc" value="18px"></attribute>
+                  <attribute name="foreground" value="red"></attribute>
                 </attributes>
               </object>
             </child>
+            <layout>
+              <property name="left_attach">1</property>
+              <property name="top_attach">5</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">1</property>
-            <property name="top_attach">5</property>
-          </packing>
         </child>
         <child>
           <object class="GtkBox" id="ex-box">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <child>
               <object class="GtkLabel">
-                <property name="visible">True</property>
-                <property name="can_focus">False</property>
                 <property name="label" translatable="yes">███</property>
                 <attributes>
-                  <attribute name="font-desc" value="15px"/>
+                  <attribute name="font-desc" value="15px"></attribute>
                 </attributes>
               </object>
             </child>
             <child>
               <object class="GtkLabel">
-                <property name="visible">True</property>
-                <property name="can_focus">False</property>
                 <property name="label" translatable="yes">███</property>
                 <attributes>
-                  <attribute name="font-desc" value="15px"/>
-                  <attribute name="foreground" value="red"/>
+                  <attribute name="font-desc" value="15px"></attribute>
+                  <attribute name="foreground" value="red"></attribute>
                 </attributes>
               </object>
             </child>
+            <layout>
+              <property name="left_attach">1</property>
+              <property name="top_attach">6</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">1</property>
-            <property name="top_attach">6</property>
-          </packing>
         </child>
       </object>
     </child>

diff --git a/testsuite/reftests/css-em-label-size.ui b/testsuite/reftests/css-em-label-size.ui
index 85ec58680ce05c4dbaa7cc9b2d57c0d4b753a062..66190f6c1b617937245d3f8d083e5ddcd031a0a4 100644 (file)
--- a/testsuite/reftests/css-em-label-size.ui
+++ b/testsuite/reftests/css-em-label-size.ui
@@ -1,282 +1,222 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!-- Generated with glade 3.20.0 -->
 <interface>
   <requires lib="gtk+" version="3.20"/>
   <object class="GtkWindow">
-    <property name="can_focus">False</property>
     <property name="type">popup</property>
     <child>
       <object class="GtkGrid">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
-        <property name="row_homogeneous">True</property>
-        <property name="width-request">300></property>
+        <property name="row_homogeneous">1</property>
+        <property name="width-request">300&gt;</property>
         <child>
           <object class="GtkLabel">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="label" translatable="yes">px</property>
-            <property name="height-request">100></property>
+            <property name="height-request">100&gt;</property>
+            <layout>
+              <property name="left_attach">0</property>
+              <property name="top_attach">0</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">0</property>
-            <property name="top_attach">0</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="label" translatable="yes">pt</property>
+            <layout>
+              <property name="left_attach">0</property>
+              <property name="top_attach">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">0</property>
-            <property name="top_attach">1</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="label" translatable="yes">in</property>
+            <layout>
+              <property name="left_attach">0</property>
+              <property name="top_attach">2</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">0</property>
-            <property name="top_attach">2</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="label" translatable="yes">cm</property>
+            <layout>
+              <property name="left_attach">0</property>
+              <property name="top_attach">3</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">0</property>
-            <property name="top_attach">3</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="label" translatable="yes">mm</property>
+            <layout>
+              <property name="left_attach">0</property>
+              <property name="top_attach">4</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">0</property>
-            <property name="top_attach">4</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="label" translatable="yes">em</property>
+            <layout>
+              <property name="left_attach">0</property>
+              <property name="top_attach">5</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">0</property>
-            <property name="top_attach">5</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="label" translatable="yes">ex</property>
+            <layout>
+              <property name="left_attach">0</property>
+              <property name="top_attach">6</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">0</property>
-            <property name="top_attach">6</property>
-          </packing>
         </child>
         <child>
           <object class="GtkBox" id="px-box">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <child>
               <object class="GtkLabel">
-                <property name="visible">True</property>
-                <property name="can_focus">False</property>
                 <property name="label" translatable="yes">███</property>
               </object>
             </child>
             <child>
               <object class="GtkLabel">
-                <property name="visible">True</property>
-                <property name="can_focus">False</property>
                 <property name="label" translatable="yes">███</property>
               </object>
             </child>
             <style>
               <class name="px"/>
             </style>
+            <layout>
+              <property name="left_attach">1</property>
+              <property name="top_attach">0</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">1</property>
-            <property name="top_attach">0</property>
-          </packing>
         </child>
         <child>
           <object class="GtkBox" id="pt-box">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <child>
               <object class="GtkLabel">
-                <property name="visible">True</property>
-                <property name="can_focus">False</property>
                 <property name="label" translatable="yes">███</property>
               </object>
             </child>
             <child>
               <object class="GtkLabel">
-                <property name="visible">True</property>
-                <property name="can_focus">False</property>
                 <property name="label" translatable="yes">███</property>
               </object>
             </child>
             <style>
               <class name="pt"/>
             </style>
+            <layout>
+              <property name="left_attach">1</property>
+              <property name="top_attach">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">1</property>
-            <property name="top_attach">1</property>
-          </packing>
         </child>
         <child>
           <object class="GtkBox" id="in-box">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <child>
               <object class="GtkLabel">
-                <property name="visible">True</property>
-                <property name="can_focus">False</property>
                 <property name="label" translatable="yes">███</property>
               </object>
             </child>
             <child>
               <object class="GtkLabel">
-                <property name="visible">True</property>
-                <property name="can_focus">False</property>
                 <property name="label" translatable="yes">███</property>
               </object>
             </child>
             <style>
               <class name="in"/>
             </style>
+            <layout>
+              <property name="left_attach">1</property>
+              <property name="top_attach">2</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">1</property>
-            <property name="top_attach">2</property>
-          </packing>
         </child>
         <child>
           <object class="GtkBox" id="cm-box">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <child>
               <object class="GtkLabel">
-                <property name="visible">True</property>
-                <property name="can_focus">False</property>
                 <property name="label" translatable="yes">███</property>
               </object>
             </child>
             <child>
               <object class="GtkLabel">
-                <property name="visible">True</property>
-                <property name="can_focus">False</property>
                 <property name="label" translatable="yes">███</property>
               </object>
             </child>
             <style>
               <class name="cm"/>
             </style>
+            <layout>
+              <property name="left_attach">1</property>
+              <property name="top_attach">3</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">1</property>
-            <property name="top_attach">3</property>
-          </packing>
         </child>
         <child>
           <object class="GtkBox" id="mm-box">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <child>
               <object class="GtkLabel">
-                <property name="visible">True</property>
-                <property name="can_focus">False</property>
                 <property name="label" translatable="yes">███</property>
               </object>
             </child>
             <child>
               <object class="GtkLabel">
-                <property name="visible">True</property>
-                <property name="can_focus">False</property>
                 <property name="label" translatable="yes">███</property>
               </object>
             </child>
             <style>
               <class name="mm"/>
             </style>
+            <layout>
+              <property name="left_attach">1</property>
+              <property name="top_attach">4</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">1</property>
-            <property name="top_attach">4</property>
-          </packing>
         </child>
         <child>
           <object class="GtkBox" id="em-box">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <child>
               <object class="GtkLabel">
-                <property name="visible">True</property>
-                <property name="can_focus">False</property>
                 <property name="label" translatable="yes">███</property>
               </object>
             </child>
             <child>
               <object class="GtkLabel">
-                <property name="visible">True</property>
-                <property name="can_focus">False</property>
                 <property name="label" translatable="yes">███</property>
               </object>
             </child>
             <style>
               <class name="em"/>
             </style>
+            <layout>
+              <property name="left_attach">1</property>
+              <property name="top_attach">5</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">1</property>
-            <property name="top_attach">5</property>
-          </packing>
         </child>
         <child>
           <object class="GtkBox" id="ex-box">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <child>
               <object class="GtkLabel">
-                <property name="visible">True</property>
-                <property name="can_focus">False</property>
                 <property name="label" translatable="yes">███</property>
               </object>
             </child>
             <child>
               <object class="GtkLabel">
-                <property name="visible">True</property>
-                <property name="can_focus">False</property>
                 <property name="label" translatable="yes">███</property>
               </object>
             </child>
             <style>
               <class name="ex"/>
             </style>
+            <layout>
+              <property name="left_attach">1</property>
+              <property name="top_attach">6</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">1</property>
-            <property name="top_attach">6</property>
-          </packing>
         </child>
       </object>
     </child>

diff --git a/testsuite/reftests/css-image-aspect-ratio.ref.ui b/testsuite/reftests/css-image-aspect-ratio.ref.ui
index 88fbd72e757298224b2f1d07b8cdd05c499dcffd..8198b0461292bc227cbd4cdcd9fdc592f3b4fb05 100644 (file)
--- a/testsuite/reftests/css-image-aspect-ratio.ref.ui
+++ b/testsuite/reftests/css-image-aspect-ratio.ref.ui
@@ -1,10 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
-  <!-- interface-requires gtk+ 3.0 -->
   <object class="GtkWindow" id="window1">
     <property name="width_request">48</property>
     <property name="height_request">24</property>
-    <property name="can_focus">False</property>
     <property name="type">popup</property>
     <property name="name">reference</property>
   </object>

diff --git a/testsuite/reftests/css-image-aspect-ratio.ui b/testsuite/reftests/css-image-aspect-ratio.ui
index c7f559893b892cc1e4268bd425f92df0a9cc3516..f9a37b7a61cf2fa57215e87afdc3f6cac2ca40f3 100644 (file)
--- a/testsuite/reftests/css-image-aspect-ratio.ui
+++ b/testsuite/reftests/css-image-aspect-ratio.ui
@@ -1,10 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
-  <!-- interface-requires gtk+ 3.0 -->
   <object class="GtkWindow" id="window1">
     <property name="width_request">48</property>
     <property name="height_request">24</property>
-    <property name="can_focus">False</property>
     <property name="type">popup</property>
   </object>
 </interface>

diff --git a/testsuite/reftests/css-image-color-aspect-ratio.ref.ui b/testsuite/reftests/css-image-color-aspect-ratio.ref.ui
index 982e3d8f8d3186e1a99460acadf44f2295495475..5e2a51192a3c5284ad6cd041c47b1b7775bec40b 100644 (file)
--- a/testsuite/reftests/css-image-color-aspect-ratio.ref.ui
+++ b/testsuite/reftests/css-image-color-aspect-ratio.ref.ui
@@ -1,10 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
-  <!-- interface-requires gtk+ 3.0 -->
   <object class="GtkWindow" id="window1">
     <property name="width_request">20</property>
     <property name="height_request">10</property>
-    <property name="can_focus">False</property>
     <property name="type">popup</property>
     <property name="name">reference</property>
   </object>

diff --git a/testsuite/reftests/css-image-color-aspect-ratio.ui b/testsuite/reftests/css-image-color-aspect-ratio.ui
index d26485622a40c3fd560cdc45c478de44c1eb8b66..63e8f04846a246d3ace34c42882a314413ab7c34 100644 (file)
--- a/testsuite/reftests/css-image-color-aspect-ratio.ui
+++ b/testsuite/reftests/css-image-color-aspect-ratio.ui
@@ -1,10 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
-  <!-- interface-requires gtk+ 3.0 -->
   <object class="GtkWindow" id="window1">
     <property name="width_request">20</property>
     <property name="height_request">10</property>
-    <property name="can_focus">False</property>
     <property name="type">popup</property>
   </object>
 </interface>

diff --git a/testsuite/reftests/css-match-class.ref.ui b/testsuite/reftests/css-match-class.ref.ui
index 65fe67e5f1a8a994a8c5c3ad50be60b732b419a9..e85bbec58218bdd0ae44dc507db0d1d85113f311 100644 (file)
--- a/testsuite/reftests/css-match-class.ref.ui
+++ b/testsuite/reftests/css-match-class.ref.ui
@@ -1,13 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
-  <!-- interface-requires gtk+ 3.0 -->
   <object class="GtkWindow">
-    <property name="can_focus">False</property>
     <property name="type">popup</property>
     <child>
       <object class="GtkPicture">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
         <property name="paintable">green-20x20.png</property>
       </object>
     </child>

diff --git a/testsuite/reftests/css-match-class.ui b/testsuite/reftests/css-match-class.ui
index ee6db3afc7216df68aaf2b4bbeb57d31ab7108c9..ab783b3219317a0bc5993b9722f5ca8cfa854711 100644 (file)
--- a/testsuite/reftests/css-match-class.ui
+++ b/testsuite/reftests/css-match-class.ui
@@ -1,14 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
-  <!-- interface-requires gtk+ 3.0 -->
   <object class="GtkWindow" id="window1">
     <property name="width_request">20</property>
     <property name="height_request">20</property>
-    <property name="can_focus">False</property>
     <property name="type">popup</property>
     <property name="name">window</property>
     <style>
-      <class name="window" />
+      <class name="window"/>
     </style>
   </object>
 </interface>

diff --git a/testsuite/reftests/css-match-descendant-later.ref.ui b/testsuite/reftests/css-match-descendant-later.ref.ui
index a6a57bedbecd0cefa24a671526b8ce676739fe62..0c8a4b46e0b773caf5f401b04f228e62ac316c74 100644 (file)
--- a/testsuite/reftests/css-match-descendant-later.ref.ui
+++ b/testsuite/reftests/css-match-descendant-later.ref.ui
@@ -1,15 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
-  <!-- interface-requires gtk+ 3.0 -->
   <object class="GtkWindow" id="window1">
-    <property name="can_focus">False</property>
     <property name="type">popup</property>
     <child>
       <object class="GtkBox" id="box1">
         <property name="width_request">10</property>
         <property name="height_request">10</property>
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
         <child>
           <placeholder/>
         </child>

diff --git a/testsuite/reftests/css-match-descendant-later.ui b/testsuite/reftests/css-match-descendant-later.ui
index 97d81708c47ecf218d1cd0c55d704b1244c5ac1f..90e3d7a3dec92dd6e4de50eba92652aceb33c145 100644 (file)
--- a/testsuite/reftests/css-match-descendant-later.ui
+++ b/testsuite/reftests/css-match-descendant-later.ui
@@ -1,41 +1,33 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
-  <!-- interface-requires gtk+ 3.0 -->
   <object class="GtkWindow" id="window1">
-    <property name="can_focus">False</property>
     <property name="type">popup</property>
     <child>
       <object class="GtkGrid" id="grid1">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
         <child>
           <object class="GtkGrid" id="grid2">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <child>
               <object class="GtkBox" id="box1">
                 <property name="width_request">10</property>
                 <property name="height_request">10</property>
-                <property name="visible">True</property>
-                <property name="can_focus">False</property>
                 <child>
                   <placeholder/>
                 </child>
+                <layout>
+                  <property name="left_attach">0</property>
+                  <property name="top_attach">0</property>
+                  <property name="column-span">1</property>
+                  <property name="row-span">1</property>
+                </layout>
               </object>
-              <packing>
-                <property name="left_attach">0</property>
-                <property name="top_attach">0</property>
-                <property name="width">1</property>
-                <property name="height">1</property>
-              </packing>
             </child>
+            <layout>
+              <property name="left_attach">0</property>
+              <property name="top_attach">0</property>
+              <property name="column-span">1</property>
+              <property name="row-span">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">0</property>
-            <property name="top_attach">0</property>
-            <property name="width">1</property>
-            <property name="height">1</property>
-          </packing>
         </child>
       </object>
     </child>

diff --git a/testsuite/reftests/css-match-exact.ref.ui b/testsuite/reftests/css-match-exact.ref.ui
index 2f24fa197b68e4945a933eba568e127d787878b0..74b65db8a153e4b5708318123e59522fb6625104 100644 (file)
--- a/testsuite/reftests/css-match-exact.ref.ui
+++ b/testsuite/reftests/css-match-exact.ref.ui
@@ -1,10 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
-  <!-- interface-requires gtk+ 3.0 -->
   <object class="GtkWindow" id="window1">
     <property name="width_request">10</property>
     <property name="height_request">10</property>
-    <property name="can_focus">False</property>
     <property name="type">popup</property>
     <child>
       <placeholder/>

diff --git a/testsuite/reftests/css-match-exact.ui b/testsuite/reftests/css-match-exact.ui
index ce2f815a36cb975ffac2c3a28cc6c320304551a7..7a9389c2d5db59c8a852ea3689c98e81125c9965 100644 (file)
--- a/testsuite/reftests/css-match-exact.ui
+++ b/testsuite/reftests/css-match-exact.ui
@@ -1,28 +1,22 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
-  <!-- interface-requires gtk+ 3.0 -->
   <object class="GtkWindow" id="window1">
     <property name="width_request">10</property>
     <property name="height_request">10</property>
-    <property name="can_focus">False</property>
     <property name="type">popup</property>
     <child>
       <object class="GtkGrid" id="grid1">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
         <child>
           <object class="GtkBox" id="box1">
             <property name="width_request">10</property>
             <property name="height_request">10</property>
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
+            <layout>
+              <property name="left_attach">0</property>
+              <property name="top_attach">0</property>
+              <property name="column-span">1</property>
+              <property name="row-span">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">0</property>
-            <property name="top_attach">0</property>
-            <property name="width">1</property>
-            <property name="height">1</property>
-          </packing>
         </child>
       </object>
     </child>

diff --git a/testsuite/reftests/css-match-import.ref.ui b/testsuite/reftests/css-match-import.ref.ui
index 03877e3bf388bd407d5c9b157a3570510006a58e..a2f55c86fdc7994ed0b4c8b1a5ff81ae6726b128 100644 (file)
--- a/testsuite/reftests/css-match-import.ref.ui
+++ b/testsuite/reftests/css-match-import.ref.ui
@@ -1,13 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
-  <!-- interface-requires gtk+ 3.0 -->
   <object class="GtkWindow" id="window1">
-    <property name="can_focus">False</property>
     <property name="type">popup</property>
     <child>
       <object class="GtkLabel" id="label1">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
         <property name="name">purple</property>
         <property name="label" translatable="yes">Purple</property>
       </object>

diff --git a/testsuite/reftests/css-match-import.ui b/testsuite/reftests/css-match-import.ui
index 3a8f869e3b3b224670cff5200c77e01fc468ed57..8ea0858c14c5f4cf22b36dc56c23037e03de237b 100644 (file)
--- a/testsuite/reftests/css-match-import.ui
+++ b/testsuite/reftests/css-match-import.ui
@@ -1,13 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
-  <!-- interface-requires gtk+ 3.0 -->
   <object class="GtkWindow" id="window1">
-    <property name="can_focus">False</property>
     <property name="type">popup</property>
     <child>
       <object class="GtkLabel" id="label1">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
         <property name="label" translatable="yes">Purple</property>
       </object>
     </child>

diff --git a/testsuite/reftests/css-match-inherit-different-state.ref.ui b/testsuite/reftests/css-match-inherit-different-state.ref.ui
index e129c9135dcbe5846966e7ea3c7cdb9c1cf67c56..84596a020863a837f9648110f64037ace2db564f 100644 (file)
--- a/testsuite/reftests/css-match-inherit-different-state.ref.ui
+++ b/testsuite/reftests/css-match-inherit-different-state.ref.ui
@@ -1,20 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
-  <!-- interface-requires gtk+ 3.0 -->
   <object class="GtkWindow" id="window1">
-    <property name="can_focus">False</property>
     <property name="type">popup</property>
     <child>
       <object class="GtkButton" id="button1">
-        <property name="visible">True</property>
-        <property name="can_focus">True</property>
-        <property name="receives_default">True</property>
+        <property name="can_focus">1</property>
+        <property name="receives_default">1</property>
         <child>
           <object class="GtkLabel" id="label1">
             <property name="name">reference</property>
-            <property name="visible">True</property>
-            <property name="sensitive">False</property>
-            <property name="can_focus">False</property>
+            <property name="sensitive">0</property>
             <property name="label" translatable="yes">I should be green</property>
           </object>
         </child>

diff --git a/testsuite/reftests/css-match-inherit-different-state.ui b/testsuite/reftests/css-match-inherit-different-state.ui
index c48bae349a4649f4d1cf3cef8a5489ddf2a67e9e..15f803784c35ab7386ad725e3139336de22b9d2c 100644 (file)
--- a/testsuite/reftests/css-match-inherit-different-state.ui
+++ b/testsuite/reftests/css-match-inherit-different-state.ui
@@ -1,19 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
-  <!-- interface-requires gtk+ 3.0 -->
   <object class="GtkWindow" id="window1">
-    <property name="can_focus">False</property>
     <property name="type">popup</property>
     <child>
       <object class="GtkButton" id="button1">
-        <property name="visible">True</property>
-        <property name="can_focus">True</property>
-        <property name="receives_default">True</property>
+        <property name="can_focus">1</property>
+        <property name="receives_default">1</property>
         <child>
           <object class="GtkLabel" id="label1">
-            <property name="visible">True</property>
-            <property name="sensitive">False</property>
-            <property name="can_focus">False</property>
+            <property name="sensitive">0</property>
             <property name="label" translatable="yes">I should be green</property>
           </object>
         </child>

diff --git a/testsuite/reftests/css-match-inherit.ref.ui b/testsuite/reftests/css-match-inherit.ref.ui
index da1077170e930b829dd15ee24299127d86368455..d3b58f74323526440b684a646fbfb5674deba6f9 100644 (file)
--- a/testsuite/reftests/css-match-inherit.ref.ui
+++ b/testsuite/reftests/css-match-inherit.ref.ui
@@ -1,17 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
-  <!-- interface-requires gtk+ 3.0 -->
   <object class="GtkWindow" id="window1">
-    <property name="can_focus">False</property>
     <property name="type">popup</property>
     <child>
       <object class="GtkButton" id="button1">
         <property name="name">reference</property>
         <property name="label" translatable="yes">Hello World</property>
-        <property name="visible">True</property>
-        <property name="can_focus">True</property>
-        <property name="has_focus">True</property>
-        <property name="receives_default">True</property>
+        <property name="can_focus">1</property>
+        <property name="has_focus">1</property>
+        <property name="receives_default">1</property>
         <style>
           <class name="testinherit"/>
         </style>

diff --git a/testsuite/reftests/css-match-inherit.ui b/testsuite/reftests/css-match-inherit.ui
index 01f5a84717f910d58b79712e10493b691694551e..8395c51add77ac7ab75508849ad4e0b911da387e 100644 (file)
--- a/testsuite/reftests/css-match-inherit.ui
+++ b/testsuite/reftests/css-match-inherit.ui
@@ -1,17 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
-  <!-- interface-requires gtk+ 3.0 -->
   <object class="GtkWindow" id="window1">
-    <property name="can_focus">False</property>
     <property name="type">popup</property>
     <child>
       <object class="GtkButton" id="button1">
         <property name="name">reference</property>
         <property name="label" translatable="yes">Hello World</property>
-        <property name="visible">True</property>
-        <property name="can_focus">True</property>
-        <property name="has_focus">True</property>
-        <property name="receives_default">True</property>
+        <property name="can_focus">1</property>
+        <property name="has_focus">1</property>
+        <property name="receives_default">1</property>
       </object>
     </child>
   </object>

diff --git a/testsuite/reftests/css-match-name.ref.ui b/testsuite/reftests/css-match-name.ref.ui
index fea1df7c08547259a4edc7b14cabae8cb59b61a4..5fc9c823dcb2b64e3e79e45af15c2aa563d05278 100644 (file)
--- a/testsuite/reftests/css-match-name.ref.ui
+++ b/testsuite/reftests/css-match-name.ref.ui
@@ -1,13 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
-  <!-- interface-requires gtk+ 3.0 -->
   <object class="GtkWindow" id="window1">
-    <property name="can_focus">False</property>
     <property name="type">popup</property>
     <child>
       <object class="GtkPicture">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
         <property name="paintable">green-20x20.png</property>
       </object>
     </child>

diff --git a/testsuite/reftests/css-match-name.ui b/testsuite/reftests/css-match-name.ui
index ee6db3afc7216df68aaf2b4bbeb57d31ab7108c9..ab783b3219317a0bc5993b9722f5ca8cfa854711 100644 (file)
--- a/testsuite/reftests/css-match-name.ui
+++ b/testsuite/reftests/css-match-name.ui
@@ -1,14 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
-  <!-- interface-requires gtk+ 3.0 -->
   <object class="GtkWindow" id="window1">
     <property name="width_request">20</property>
     <property name="height_request">20</property>
-    <property name="can_focus">False</property>
     <property name="type">popup</property>
     <property name="name">window</property>
     <style>
-      <class name="window" />
+      <class name="window"/>
     </style>
   </object>
 </interface>

diff --git a/testsuite/reftests/css-match-siblings.ref.ui b/testsuite/reftests/css-match-siblings.ref.ui
index 38ff34a71c5c012f275f9801b18afc8d2f2dd73b..cdd1d6730bdfc0a4238994328142c57df5f3b5e9 100644 (file)
--- a/testsuite/reftests/css-match-siblings.ref.ui
+++ b/testsuite/reftests/css-match-siblings.ref.ui
@@ -1,49 +1,35 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
-  <!-- interface-requires gtk+ 3.0 -->
   <object class="GtkWindow" id="window1">
-    <property name="can_focus">False</property>
     <property name="type">popup</property>
     <child>
       <object class="GtkBox" id="box1">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
         <property name="orientation">vertical</property>
         <child>
           <object class="GtkLabel" id="label1">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="label" translatable="yes">normal</property>
           </object>
         </child>
         <child>
           <object class="GtkLabel" id="label2">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="label" translatable="yes">Red</property>
             <property name="name">red</property>
           </object>
         </child>
         <child>
           <object class="GtkLabel" id="label3">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="label" translatable="yes">Green</property>
             <property name="name">green</property>
           </object>
         </child>
         <child>
           <object class="GtkLabel" id="label4">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="label" translatable="yes">Blue</property>
             <property name="name">blue</property>
           </object>
         </child>
         <child>
           <object class="GtkLabel" id="label5">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="label" translatable="yes">Purple</property>
             <property name="name">purple</property>
           </object>

diff --git a/testsuite/reftests/css-match-siblings.ui b/testsuite/reftests/css-match-siblings.ui
index 91a2dec80b37f6e25444265de42954091201807d..5e8dfcae6ccf31efdcd3e71f0b421ba019454606 100644 (file)
--- a/testsuite/reftests/css-match-siblings.ui
+++ b/testsuite/reftests/css-match-siblings.ui
@@ -1,46 +1,32 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
-  <!-- interface-requires gtk+ 3.0 -->
   <object class="GtkWindow" id="window1">
-    <property name="can_focus">False</property>
     <property name="type">popup</property>
     <child>
       <object class="GtkBox" id="box1">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
         <property name="orientation">vertical</property>
         <child>
           <object class="GtkLabel" id="label1">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="label" translatable="yes">normal</property>
           </object>
         </child>
         <child>
           <object class="GtkLabel" id="label2">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="label" translatable="yes">Red</property>
           </object>
         </child>
         <child>
           <object class="GtkLabel" id="label3">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="label" translatable="yes">Green</property>
           </object>
         </child>
         <child>
           <object class="GtkLabel" id="label4">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="label" translatable="yes">Blue</property>
           </object>
         </child>
         <child>
           <object class="GtkLabel" id="label5">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="label" translatable="yes">Purple</property>
           </object>
         </child>

diff --git a/testsuite/reftests/css-match-type.ref.ui b/testsuite/reftests/css-match-type.ref.ui
index fea1df7c08547259a4edc7b14cabae8cb59b61a4..5fc9c823dcb2b64e3e79e45af15c2aa563d05278 100644 (file)
--- a/testsuite/reftests/css-match-type.ref.ui
+++ b/testsuite/reftests/css-match-type.ref.ui
@@ -1,13 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
-  <!-- interface-requires gtk+ 3.0 -->
   <object class="GtkWindow" id="window1">
-    <property name="can_focus">False</property>
     <property name="type">popup</property>
     <child>
       <object class="GtkPicture">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
         <property name="paintable">green-20x20.png</property>
       </object>
     </child>

diff --git a/testsuite/reftests/css-match-type.ui b/testsuite/reftests/css-match-type.ui
index ee6db3afc7216df68aaf2b4bbeb57d31ab7108c9..ab783b3219317a0bc5993b9722f5ca8cfa854711 100644 (file)
--- a/testsuite/reftests/css-match-type.ui
+++ b/testsuite/reftests/css-match-type.ui
@@ -1,14 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
-  <!-- interface-requires gtk+ 3.0 -->
   <object class="GtkWindow" id="window1">
     <property name="width_request">20</property>
     <property name="height_request">20</property>
-    <property name="can_focus">False</property>
     <property name="type">popup</property>
     <property name="name">window</property>
     <style>
-      <class name="window" />
+      <class name="window"/>
     </style>
   </object>
 </interface>

diff --git a/testsuite/reftests/css-multi-state.ref.ui b/testsuite/reftests/css-multi-state.ref.ui
index 5b4e55a936f83989e2a802ed9d0f742093c25559..b99269be6b9ec4e4a45b1e56603a204f4696a30b 100644 (file)
--- a/testsuite/reftests/css-multi-state.ref.ui
+++ b/testsuite/reftests/css-multi-state.ref.ui
@@ -1,21 +1,16 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
-  <!-- interface-requires gtk+ 3.0 -->
   <object class="GtkWindow" id="window1">
-    <property name="can_focus">False</property>
     <property name="type">popup</property>
     <child>
       <object class="GtkToggleButton" id="togglebutton1">
-        <property name="visible">True</property>
-        <property name="can_focus">True</property>
-        <property name="receives_default">True</property>
-        <property name="active">True</property>
+        <property name="can_focus">1</property>
+        <property name="receives_default">1</property>
+        <property name="active">1</property>
         <property name="name">reference</property>
-        <property name="sensitive">False</property>
+        <property name="sensitive">0</property>
         <child>
           <object class="GtkLabel" id="label1">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="label" translatable="yes">insensitive</property>
           </object>
         </child>

diff --git a/testsuite/reftests/css-multi-state.ui b/testsuite/reftests/css-multi-state.ui
index 1a3aaa6fb9503226361d8c8f5b7488797f6e9d92..9f7979e29aeccfed5536dd84ea20f1a433672d19 100644 (file)
--- a/testsuite/reftests/css-multi-state.ui
+++ b/testsuite/reftests/css-multi-state.ui
@@ -1,20 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
-  <!-- interface-requires gtk+ 3.0 -->
   <object class="GtkWindow" id="window1">
-    <property name="can_focus">False</property>
     <property name="type">popup</property>
     <child>
       <object class="GtkToggleButton" id="togglebutton1">
-        <property name="visible">True</property>
-        <property name="can_focus">True</property>
-        <property name="receives_default">True</property>
-        <property name="active">True</property>
-        <property name="sensitive">False</property>
+        <property name="can_focus">1</property>
+        <property name="receives_default">1</property>
+        <property name="active">1</property>
+        <property name="sensitive">0</property>
         <child>
           <object class="GtkLabel" id="label1">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="label" translatable="yes">insensitive</property>
           </object>
         </child>

diff --git a/testsuite/reftests/css-rem-label-size.ref.ui b/testsuite/reftests/css-rem-label-size.ref.ui
index eef675c6ee12b29ec6afa1bd10d4a23765e80e5f..aa903fb77dd30648964353e6afcf6fc3fc5a5d5c 100644 (file)
--- a/testsuite/reftests/css-rem-label-size.ref.ui
+++ b/testsuite/reftests/css-rem-label-size.ref.ui
@@ -1,14 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!-- Generated with glade 3.20.0 -->
 <interface>
   <requires lib="gtk+" version="3.20"/>
   <object class="GtkWindow">
-    <property name="can_focus">False</property>
     <property name="type">popup</property>
     <child>
       <object class="GtkLabel">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
         <property name="label" translatable="yes">███</property>
       </object>
     </child>

diff --git a/testsuite/reftests/css-rem-label-size.ui b/testsuite/reftests/css-rem-label-size.ui
index 957716ee8645dac479f3f914df0a710e957b6309..f70bf806000d98f5d43fa8dfbd5006f6874ae603 100644 (file)
--- a/testsuite/reftests/css-rem-label-size.ui
+++ b/testsuite/reftests/css-rem-label-size.ui
@@ -1,14 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!-- Generated with glade 3.20.0 -->
 <interface>
   <requires lib="gtk+" version="3.20"/>
   <object class="GtkWindow">
-    <property name="can_focus">False</property>
     <property name="type">popup</property>
     <child>
       <object class="GtkLabel">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
         <property name="label" translatable="yes">███</property>
       </object>
     </child>

diff --git a/testsuite/reftests/expander.ref.ui b/testsuite/reftests/expander.ref.ui
index 834029fd19f429b04147c018a5df84024e63572b..cf55a788dca3b10521cef72f9bbf0c65fcdfaff3 100644 (file)
--- a/testsuite/reftests/expander.ref.ui
+++ b/testsuite/reftests/expander.ref.ui
@@ -1,17 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
-  <!-- interface-requires gtk+ 3.0 -->
   <object class="GtkWindow" id="window1">
-    <property name="can_focus">False</property>
     <property name="type">popup</property>
     <child>
       <object class="GtkExpander" id="expander1">
-        <property name="visible">True</property>
-        <property name="expanded">True</property>
+        <property name="expanded">1</property>
         <property name="label">Hello</property>
         <child>
           <object class="GtkLabel">
-            <property name="visible">True</property>
             <property name="label">Hello</property>
           </object>
         </child>

diff --git a/testsuite/reftests/expander.ui b/testsuite/reftests/expander.ui
index 21c3c66eedbce8b8ca8a93e7ffa10294db68cced..628d0c60c91063a992faadabba6a10c748c2f39f 100644 (file)
--- a/testsuite/reftests/expander.ui
+++ b/testsuite/reftests/expander.ui
@@ -1,19 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
-  <!-- interface-requires gtk+ 3.0 -->
   <object class="GtkWindow" id="window1">
-    <property name="can_focus">False</property>
     <property name="type">popup</property>
     <child>
       <object class="GtkExpander" id="expander1">
-        <property name="visible">True</property>
-        <property name="expanded">False</property>
         <property name="label">Hello</property>
-        <property name="resize_toplevel">True</property>
+        <property name="resize_toplevel">1</property>
         <signal name="map" handler="reftest:expand_expander" swapped="no"/>
         <child>
           <object class="GtkLabel">
-            <property name="visible">True</property>
             <property name="label">Hello</property>
           </object>
         </child>

diff --git a/testsuite/reftests/fixed-widget-stacking.ref.ui b/testsuite/reftests/fixed-widget-stacking.ref.ui
index 436c4273676540a64742ae47819518af35b394be..d40e3f0bac683fc71b100f4540b1ce770085fad1 100644 (file)
--- a/testsuite/reftests/fixed-widget-stacking.ref.ui
+++ b/testsuite/reftests/fixed-widget-stacking.ref.ui
@@ -1,24 +1,17 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!-- Generated with glade 3.16.0 on Tue Feb 25 14:09:41 2014 -->
 <interface>
-  <!-- interface-requires gtk+ 3.10 -->
   <object class="GtkTextBuffer" id="textbuffer1">
     <property name="text" translatable="yes">TEST123
 TEST123</property>
   </object>
   <object class="GtkWindow" id="window1">
-    <property name="can_focus">False</property>
     <property name="type">popup</property>
     <child>
       <object class="GtkFixed" id="fixed1">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
         <child>
           <object class="GtkTextView" id="textview1">
             <property name="width_request">100</property>
             <property name="height_request">100</property>
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="buffer">textbuffer1</property>
           </object>
         </child>
@@ -26,14 +19,13 @@ TEST123</property>
           <object class="GtkTextView" id="textview2">
             <property name="width_request">100</property>
             <property name="height_request">100</property>
-            <property name="visible">True</property>
-            <property name="can_focus">True</property>
+            <property name="can_focus">1</property>
             <property name="buffer">textbuffer1</property>
+            <layout>
+              <property name="x">50</property>
+              <property name="y">50</property>
+            </layout>
           </object>
-          <packing>
-            <property name="x">50</property>
-            <property name="y">50</property>
-          </packing>
         </child>
       </object>
     </child>

diff --git a/testsuite/reftests/fixed-widget-stacking.ui b/testsuite/reftests/fixed-widget-stacking.ui
index b193343e689ebe936e259f90519d323a4fed820f..e4737db3d9d88a8163781f8ed5e778f4868d84b5 100644 (file)
--- a/testsuite/reftests/fixed-widget-stacking.ui
+++ b/testsuite/reftests/fixed-widget-stacking.ui
@@ -1,46 +1,36 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!-- Generated with glade 3.16.0 on Tue Feb 25 14:09:29 2014 -->
 <interface>
-  <!-- interface-requires gtk+ 3.10 -->
   <object class="GtkTextBuffer" id="textbuffer1">
     <property name="text" translatable="yes">TEST123
 TEST123</property>
   </object>
   <object class="GtkWindow" id="window1">
-    <property name="can_focus">False</property>
     <property name="type">popup</property>
     <child>
       <object class="GtkFixed" id="fixed1">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
         <child>
           <object class="GtkTextView" id="textview1">
             <property name="width_request">100</property>
             <property name="height_request">100</property>
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="buffer">textbuffer1</property>
           </object>
         </child>
         <child>
           <object class="GtkBox" id="box1">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="orientation">vertical</property>
             <child>
               <object class="GtkTextView" id="textview2">
                 <property name="width_request">100</property>
                 <property name="height_request">100</property>
-                <property name="visible">True</property>
-                <property name="can_focus">True</property>
+                <property name="can_focus">1</property>
                 <property name="buffer">textbuffer1</property>
               </object>
             </child>
+            <layout>
+              <property name="x">50</property>
+              <property name="y">50</property>
+            </layout>
           </object>
-          <packing>
-            <property name="x">50</property>
-            <property name="y">50</property>
-          </packing>
         </child>
       </object>
     </child>

diff --git a/testsuite/reftests/flipping-icons.ref.ui b/testsuite/reftests/flipping-icons.ref.ui
index 638e5283510e749d0950ed2a9dd7c8d9c96b488a..a6698828516e2b2dc1cc3de605bfa0575d7e4e89 100644 (file)
--- a/testsuite/reftests/flipping-icons.ref.ui
+++ b/testsuite/reftests/flipping-icons.ref.ui
@@ -1,60 +1,49 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!-- Generated with glade 3.18.1 -->
 <interface>
   <requires lib="gtk+" version="3.12"/>
   <object class="GtkWindow" id="window1">
-    <property name="can_focus">False</property>
     <property name="type">popup</property>
     <child>
       <object class="GtkBox">
-        <property name="visible">True</property>
         <property name="orientation">vertical</property>
         <child>
           <object class="GtkImage">
-            <property name="visible">True</property> 
-            <property name="icon-name">go-last</property> 
+            <property name="icon-name">go-last</property>
           </object>
         </child>
         <child>
           <object class="GtkImage">
-            <property name="visible">True</property> 
-            <property name="icon-name">go-first</property> 
+            <property name="icon-name">go-first</property>
           </object>
         </child>
         <child>
           <object class="GtkImage">
-            <property name="visible">True</property> 
-            <property name="icon-name">media-skip-backward</property> 
+            <property name="icon-name">media-skip-backward</property>
           </object>
         </child>
         <child>
           <object class="GtkImage">
-            <property name="visible">True</property> 
-            <property name="icon-name">media-skip-forward</property> 
+            <property name="icon-name">media-skip-forward</property>
           </object>
         </child>
         <child>
           <object class="GtkImage">
-            <property name="visible">True</property> 
-            <property name="icon-name">media-seek-backward</property> 
+            <property name="icon-name">media-seek-backward</property>
           </object>
         </child>
         <child>
           <object class="GtkImage">
-            <property name="visible">True</property> 
-            <property name="icon-name">media-seek-forward</property> 
+            <property name="icon-name">media-seek-forward</property>
           </object>
         </child>
         <child>
           <object class="GtkImage">
-            <property name="visible">True</property> 
-            <property name="icon-name">pan-end-symbolic</property> 
+            <property name="icon-name">pan-end-symbolic</property>
           </object>
         </child>
         <child>
           <object class="GtkImage">
-            <property name="visible">True</property> 
-            <property name="icon-name">pan-start-symbolic</property> 
+            <property name="icon-name">pan-start-symbolic</property>
           </object>
         </child>
       </object>

diff --git a/testsuite/reftests/flipping-icons.ui b/testsuite/reftests/flipping-icons.ui
index 94c81ac7ca46ac2095b52cac4337348d1fdc6a15..3a508cf48e9366d0570b320506839c01f84833f8 100644 (file)
--- a/testsuite/reftests/flipping-icons.ui
+++ b/testsuite/reftests/flipping-icons.ui
@@ -1,62 +1,51 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!-- Generated with glade 3.18.1 -->
 <interface>
   <requires lib="gtk+" version="3.12"/>
   <object class="GtkWindow" id="window1">
-    <property name="can_focus">False</property>
     <property name="type">popup</property>
     <signal name="map" handler="reftest:switch_default_direction" swapped="no"/>
     <signal name="destroy" handler="reftest:switch_default_direction" swapped="no"/>
     <child>
       <object class="GtkBox">
-        <property name="visible">True</property>
         <property name="orientation">vertical</property>
         <child>
           <object class="GtkImage">
-            <property name="visible">True</property> 
-            <property name="icon-name">go-first</property> 
+            <property name="icon-name">go-first</property>
           </object>
         </child>
         <child>
           <object class="GtkImage">
-            <property name="visible">True</property> 
-            <property name="icon-name">go-last</property> 
+            <property name="icon-name">go-last</property>
           </object>
         </child>
         <child>
           <object class="GtkImage">
-            <property name="visible">True</property> 
-            <property name="icon-name">media-skip-forward</property> 
+            <property name="icon-name">media-skip-forward</property>
           </object>
         </child>
         <child>
           <object class="GtkImage">
-            <property name="visible">True</property> 
-            <property name="icon-name">media-skip-backward</property> 
+            <property name="icon-name">media-skip-backward</property>
           </object>
         </child>
         <child>
           <object class="GtkImage">
-            <property name="visible">True</property> 
-            <property name="icon-name">media-seek-forward</property> 
+            <property name="icon-name">media-seek-forward</property>
           </object>
         </child>
         <child>
           <object class="GtkImage">
-            <property name="visible">True</property> 
-            <property name="icon-name">media-seek-backward</property> 
+            <property name="icon-name">media-seek-backward</property>
           </object>
         </child>
         <child>
           <object class="GtkImage">
-            <property name="visible">True</property> 
-            <property name="icon-name">pan-start-symbolic</property> 
+            <property name="icon-name">pan-start-symbolic</property>
           </object>
         </child>
         <child>
           <object class="GtkImage">
-            <property name="visible">True</property> 
-            <property name="icon-name">pan-end-symbolic</property> 
+            <property name="icon-name">pan-end-symbolic</property>
           </object>
         </child>
       </object>

diff --git a/testsuite/reftests/font-sizes-names.ref.ui b/testsuite/reftests/font-sizes-names.ref.ui
index bcf2fe8d89b510d9b1bffcb26362514d099e27bb..da94ffd4baa06c8ca2b4404623feb2372b17a4e3 100644 (file)
--- a/testsuite/reftests/font-sizes-names.ref.ui
+++ b/testsuite/reftests/font-sizes-names.ref.ui
@@ -1,96 +1,70 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
-  <!-- interface-requires gtk+ 3.0 -->
   <object class="GtkWindow" id="window1">
-    <property name="can_focus">False</property>
     <property name="type">popup</property>
     <property name="name">reference</property>
     <child>
       <object class="GtkBox" id="box1">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
         <property name="orientation">vertical</property>
         <child>
           <object class="GtkLabel" id="label1">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="label" translatable="yes">xx-small</property>
             <property name="name">xx-small</property>
           </object>
         </child>
         <child>
           <object class="GtkLabel" id="label2">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="label" translatable="yes">x-small</property>
             <property name="name">x-small</property>
           </object>
         </child>
         <child>
           <object class="GtkLabel" id="label3">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="label" translatable="yes">small</property>
             <property name="name">small</property>
           </object>
         </child>
         <child>
           <object class="GtkLabel" id="label4">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="label" translatable="yes">medium</property>
             <property name="name">medium</property>
           </object>
         </child>
         <child>
           <object class="GtkLabel" id="label5">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="label" translatable="yes">large</property>
             <property name="name">large</property>
           </object>
         </child>
         <child>
           <object class="GtkLabel" id="label6">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="label" translatable="yes">x-large</property>
             <property name="name">x-large</property>
           </object>
         </child>
         <child>
           <object class="GtkLabel" id="label7">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="label" translatable="yes">xx-large</property>
             <property name="name">xx-large</property>
           </object>
         </child>
         <child>
           <object class="GtkLabel" id="label8">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="label" translatable="yes">smaller</property>
             <property name="name">smaller</property>
           </object>
         </child>
         <child>
           <object class="GtkLabel" id="label9">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="label" translatable="yes">larger</property>
             <property name="name">larger</property>
           </object>
         </child>
         <child>
           <object class="GtkBox" id="box-smaller">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="orientation">vertical</property>
             <child>
               <object class="GtkLabel" id="label10">
-                <property name="visible">True</property>
-                <property name="can_focus">False</property>
                 <property name="label" translatable="yes">smaller smaller</property>
                 <property name="name">smaller-smaller</property>
               </object>
@@ -99,13 +73,9 @@
         </child>
         <child>
           <object class="GtkBox" id="box-larger">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="orientation">vertical</property>
             <child>
               <object class="GtkLabel" id="label11">
-                <property name="visible">True</property>
-                <property name="can_focus">False</property>
                 <property name="label" translatable="yes">larger larger</property>
                 <property name="name">larger-larger</property>
               </object>

diff --git a/testsuite/reftests/font-sizes-names.ui b/testsuite/reftests/font-sizes-names.ui
index 3789ac48bbada96b9b2f20804fd32e07478dee32..6c396675cf1e702767faa4c8cbe0aeb2a29a468d 100644 (file)
--- a/testsuite/reftests/font-sizes-names.ui
+++ b/testsuite/reftests/font-sizes-names.ui
@@ -1,96 +1,70 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
-  <!-- interface-requires gtk+ 3.0 -->
   <object class="GtkWindow" id="window1">
-    <property name="can_focus">False</property>
     <property name="type">popup</property>
     <child>
       <object class="GtkBox" id="box1">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
         <property name="orientation">vertical</property>
         <child>
           <object class="GtkLabel" id="label1">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="label" translatable="yes">xx-small</property>
             <property name="name">xx-small</property>
           </object>
         </child>
         <child>
           <object class="GtkLabel" id="label2">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="label" translatable="yes">x-small</property>
             <property name="name">x-small</property>
           </object>
         </child>
         <child>
           <object class="GtkLabel" id="label3">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="label" translatable="yes">small</property>
             <property name="name">small</property>
           </object>
         </child>
         <child>
           <object class="GtkLabel" id="label4">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="label" translatable="yes">medium</property>
             <property name="name">medium</property>
           </object>
         </child>
         <child>
           <object class="GtkLabel" id="label5">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="label" translatable="yes">large</property>
             <property name="name">large</property>
           </object>
         </child>
         <child>
           <object class="GtkLabel" id="label6">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="label" translatable="yes">x-large</property>
             <property name="name">x-large</property>
           </object>
         </child>
         <child>
           <object class="GtkLabel" id="label7">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="label" translatable="yes">xx-large</property>
             <property name="name">xx-large</property>
           </object>
         </child>
         <child>
           <object class="GtkLabel" id="label8">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="label" translatable="yes">smaller</property>
             <property name="name">smaller</property>
           </object>
         </child>
         <child>
           <object class="GtkLabel" id="label9">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="label" translatable="yes">larger</property>
             <property name="name">larger</property>
           </object>
         </child>
         <child>
           <object class="GtkBox" id="box-smaller">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="orientation">vertical</property>
             <property name="name">smaller</property>
             <child>
               <object class="GtkLabel" id="label10">
-                <property name="visible">True</property>
-                <property name="can_focus">False</property>
                 <property name="label" translatable="yes">smaller smaller</property>
                 <property name="name">smaller</property>
               </object>
@@ -99,14 +73,10 @@
         </child>
         <child>
           <object class="GtkBox" id="box-larger">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="orientation">vertical</property>
             <property name="name">larger</property>
             <child>
               <object class="GtkLabel" id="label11">
-                <property name="visible">True</property>
-                <property name="can_focus">False</property>
                 <property name="label" translatable="yes">larger larger</property>
                 <property name="name">larger</property>
               </object>

diff --git a/testsuite/reftests/grid-empty-with-spacing.ref.ui b/testsuite/reftests/grid-empty-with-spacing.ref.ui
index dccd1b8bfac676de90f2b0ee16cb572bca8082fa..aa2b506bf9ec66861bdfd1a99a596703fdb68bee 100644 (file)
--- a/testsuite/reftests/grid-empty-with-spacing.ref.ui
+++ b/testsuite/reftests/grid-empty-with-spacing.ref.ui
@@ -1,13 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
-  <!-- interface-requires gtk+ 3.0 -->
   <object class="GtkWindow" id="window1">
-    <property name="can_focus">False</property>
     <property name="type">popup</property>
     <child>
       <object class="GtkGrid" id="grid1">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
         <property name="row_spacing">5</property>
         <property name="column_spacing">5</property>
       </object>

diff --git a/testsuite/reftests/grid-empty-with-spacing.ui b/testsuite/reftests/grid-empty-with-spacing.ui
index 23f0caaf6cc59d88945baab13d923ec736b3baf1..5b9e81e76b204cc06bb270444999cfd635de8159 100644 (file)
--- a/testsuite/reftests/grid-empty-with-spacing.ui
+++ b/testsuite/reftests/grid-empty-with-spacing.ui
@@ -1,27 +1,22 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
-  <!-- interface-requires gtk+ 3.0 -->
   <object class="GtkWindow" id="window1">
-    <property name="can_focus">False</property>
     <property name="type">popup</property>
     <child>
       <object class="GtkGrid" id="grid1">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
         <property name="row_spacing">5</property>
         <property name="column_spacing">5</property>
         <child>
           <object class="GtkLabel" id="label1">
-            <property name="visible">False</property>
-            <property name="can_focus">False</property>
+            <property name="visible">0</property>
             <property name="label" translatable="yes">invisible</property>
+            <layout>
+              <property name="left_attach">0</property>
+              <property name="top_attach">0</property>
+              <property name="column-span">1</property>
+              <property name="row-span">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">0</property>
-            <property name="top_attach">0</property>
-            <property name="width">1</property>
-            <property name="height">1</property>
-          </packing>
         </child>
       </object>
     </child>

diff --git a/testsuite/reftests/grid-expand.ref.ui b/testsuite/reftests/grid-expand.ref.ui
index 9139bcdee51d4d4c13e4460259c598fe9335c613..431a73c05fb0bc67384898fb0cab4b255ad84ae3 100644 (file)
--- a/testsuite/reftests/grid-expand.ref.ui
+++ b/testsuite/reftests/grid-expand.ref.ui
@@ -1,65 +1,55 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
-  <!-- interface-requires gtk+ 3.0 -->
   <object class="GtkWindow" id="window1">
     <property name="width_request">100</property>
     <property name="height_request">100</property>
-    <property name="can_focus">False</property>
     <property name="type">popup</property>
     <child>
       <object class="GtkGrid" id="grid1">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
         <child>
           <object class="GtkBox" id="box1">
             <property name="width_request">45</property>
             <property name="height_request">10</property>
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <child>
               <placeholder/>
             </child>
+            <layout>
+              <property name="left_attach">0</property>
+              <property name="top_attach">0</property>
+              <property name="column-span">1</property>
+              <property name="row-span">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">0</property>
-            <property name="top_attach">0</property>
-            <property name="width">1</property>
-            <property name="height">1</property>
-          </packing>
         </child>
         <child>
           <object class="GtkBox" id="box2">
             <property name="width_request">45</property>
             <property name="height_request">45</property>
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <child>
               <placeholder/>
             </child>
+            <layout>
+              <property name="left_attach">1</property>
+              <property name="top_attach">1</property>
+              <property name="column-span">1</property>
+              <property name="row-span">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">1</property>
-            <property name="top_attach">1</property>
-            <property name="width">1</property>
-            <property name="height">1</property>
-          </packing>
         </child>
         <child>
           <object class="GtkBox" id="box3">
             <property name="width_request">10</property>
             <property name="height_request">45</property>
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <child>
               <placeholder/>
             </child>
+            <layout>
+              <property name="left_attach">2</property>
+              <property name="top_attach">2</property>
+              <property name="column-span">1</property>
+              <property name="row-span">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">2</property>
-            <property name="top_attach">2</property>
-            <property name="width">1</property>
-            <property name="height">1</property>
-          </packing>
         </child>
       </object>
     </child>

diff --git a/testsuite/reftests/grid-expand.ui b/testsuite/reftests/grid-expand.ui
index 3819ed65009284aa6d91e9713b489b26b0c0086d..c0b33be95f630fecb7bd46838a24aaac69640db5 100644 (file)
--- a/testsuite/reftests/grid-expand.ui
+++ b/testsuite/reftests/grid-expand.ui
@@ -1,77 +1,65 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
-  <!-- interface-requires gtk+ 3.0 -->
   <object class="GtkWindow" id="window1">
     <property name="width_request">100</property>
     <property name="height_request">100</property>
-    <property name="can_focus">False</property>
     <property name="type">popup</property>
     <child>
       <object class="GtkGrid" id="grid0">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
         <child>
           <object class="GtkGrid" id="grid1">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <child>
               <object class="GtkBox" id="box1">
                 <property name="width_request">10</property>
                 <property name="height_request">10</property>
-                <property name="visible">True</property>
-                <property name="can_focus">False</property>
-                <property name="hexpand">True</property>
-                <property name="hexpand-set">True</property>
+                <property name="hexpand">1</property>
+                <property name="hexpand-set">1</property>
                 <child>
                   <placeholder/>
                 </child>
+                <layout>
+                  <property name="left_attach">0</property>
+                  <property name="top_attach">0</property>
+                  <property name="column-span">1</property>
+                  <property name="row-span">1</property>
+                </layout>
               </object>
-              <packing>
-                <property name="left_attach">0</property>
-                <property name="top_attach">0</property>
-                <property name="width">1</property>
-                <property name="height">1</property>
-              </packing>
             </child>
             <child>
               <object class="GtkBox" id="box2">
                 <property name="width_request">10</property>
                 <property name="height_request">10</property>
-                <property name="visible">True</property>
-                <property name="can_focus">False</property>
-                <property name="hexpand">True</property>
-                <property name="hexpand-set">True</property>
-                <property name="vexpand">True</property>
-                <property name="vexpand-set">True</property>
+                <property name="hexpand">1</property>
+                <property name="hexpand-set">1</property>
+                <property name="vexpand">1</property>
+                <property name="vexpand-set">1</property>
                 <child>
                   <placeholder/>
                 </child>
+                <layout>
+                  <property name="left_attach">1</property>
+                  <property name="top_attach">1</property>
+                  <property name="column-span">1</property>
+                  <property name="row-span">1</property>
+                </layout>
               </object>
-              <packing>
-                <property name="left_attach">1</property>
-                <property name="top_attach">1</property>
-                <property name="width">1</property>
-                <property name="height">1</property>
-              </packing>
             </child>
             <child>
               <object class="GtkBox" id="box3">
                 <property name="width_request">10</property>
                 <property name="height_request">10</property>
-                <property name="visible">True</property>
-                <property name="can_focus">False</property>
-                <property name="vexpand">True</property>
-                <property name="vexpand-set">True</property>
+                <property name="vexpand">1</property>
+                <property name="vexpand-set">1</property>
                 <child>
                   <placeholder/>
                 </child>
+                <layout>
+                  <property name="left_attach">2</property>
+                  <property name="top_attach">2</property>
+                  <property name="column-span">1</property>
+                  <property name="row-span">1</property>
+                </layout>
               </object>
-              <packing>
-                <property name="left_attach">2</property>
-                <property name="top_attach">2</property>
-                <property name="width">1</property>
-                <property name="height">1</property>
-              </packing>
             </child>
           </object>
         </child>

diff --git a/testsuite/reftests/grid-homogeneous.ref.ui b/testsuite/reftests/grid-homogeneous.ref.ui
index 7b87fef07f95de1ce284dd7a52829044a25368dd..d40f0d620da4076ba634a08b08c13e60b4477c0b 100644 (file)
--- a/testsuite/reftests/grid-homogeneous.ref.ui
+++ b/testsuite/reftests/grid-homogeneous.ref.ui
@@ -1,133 +1,113 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
-  <!-- interface-requires gtk+ 3.0 -->
   <object class="GtkWindow" id="window1">
     <property name="type">popup</property>
-    <property name="can_focus">False</property>
     <child>
       <object class="GtkGrid" id="grid1">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
         <child>
           <object class="GtkBox" id="box1">
             <property name="name">red</property>
             <property name="width_request">30</property>
             <property name="height_request">30</property>
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
+            <layout>
+              <property name="left_attach">0</property>
+              <property name="top_attach">0</property>
+              <property name="column-span">1</property>
+              <property name="row-span">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">0</property>
-            <property name="top_attach">0</property>
-            <property name="width">1</property>
-            <property name="height">1</property>
-          </packing>
         </child>
         <child>
           <object class="GtkBox" id="box2">
             <property name="name">green</property>
             <property name="width_request">20</property>
             <property name="height_request">20</property>
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
+            <layout>
+              <property name="left_attach">1</property>
+              <property name="top_attach">1</property>
+              <property name="column-span">1</property>
+              <property name="row-span">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">1</property>
-            <property name="top_attach">1</property>
-            <property name="width">1</property>
-            <property name="height">1</property>
-          </packing>
         </child>
         <child>
           <object class="GtkBox" id="box3">
             <property name="name">red</property>
             <property name="width_request">30</property>
             <property name="height_request">30</property>
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
+            <layout>
+              <property name="left_attach">0</property>
+              <property name="top_attach">2</property>
+              <property name="column-span">1</property>
+              <property name="row-span">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">0</property>
-            <property name="top_attach">2</property>
-            <property name="width">1</property>
-            <property name="height">1</property>
-          </packing>
         </child>
         <child>
           <object class="GtkBox" id="box4">
             <property name="name">green</property>
             <property name="width_request">20</property>
             <property name="height_request">30</property>
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
+            <layout>
+              <property name="left_attach">1</property>
+              <property name="top_attach">3</property>
+              <property name="column-span">1</property>
+              <property name="row-span">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">1</property>
-            <property name="top_attach">3</property>
-            <property name="width">1</property>
-            <property name="height">1</property>
-          </packing>
         </child>
         <child>
           <object class="GtkBox" id="box5">
             <property name="name">red</property>
             <property name="width_request">30</property>
             <property name="height_request">30</property>
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
+            <layout>
+              <property name="left_attach">2</property>
+              <property name="top_attach">0</property>
+              <property name="column-span">1</property>
+              <property name="row-span">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">2</property>
-            <property name="top_attach">0</property>
-            <property name="width">1</property>
-            <property name="height">1</property>
-          </packing>
         </child>
         <child>
           <object class="GtkBox" id="box6">
             <property name="name">green</property>
             <property name="width_request">30</property>
             <property name="height_request">20</property>
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
+            <layout>
+              <property name="left_attach">3</property>
+              <property name="top_attach">1</property>
+              <property name="column-span">1</property>
+              <property name="row-span">1</property>
+            </layout>
+          </object>
+        </child>
+        <child>
+          <object class="GtkBox" id="box7">
+            <property name="name">red</property>
+            <property name="width_request">30</property>
+            <property name="height_request">30</property>
+            <layout>
+              <property name="left_attach">2</property>
+              <property name="top_attach">2</property>
+              <property name="column-span">1</property>
+              <property name="row-span">1</property>
+            </layout>
+          </object>
+        </child>
+        <child>
+          <object class="GtkBox" id="box8">
+            <property name="name">green</property>
+            <property name="width_request">30</property>
+            <property name="height_request">30</property>
+            <layout>
+              <property name="left_attach">3</property>
+              <property name="top_attach">3</property>
+              <property name="column-span">1</property>
+              <property name="row-span">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">3</property>
-            <property name="top_attach">1</property>
-            <property name="width">1</property>
-            <property name="height">1</property>
-          </packing>
         </child>
-            <child>
-              <object class="GtkBox" id="box7">
-                <property name="name">red</property>
-                <property name="width_request">30</property>
-                <property name="height_request">30</property>
-                <property name="visible">True</property>
-                <property name="can_focus">False</property>
-              </object>
-              <packing>
-                <property name="left_attach">2</property>
-                <property name="top_attach">2</property>
-                <property name="width">1</property>
-                <property name="height">1</property>
-              </packing>
-            </child>
-            <child>
-              <object class="GtkBox" id="box8">
-                <property name="name">green</property>
-                <property name="width_request">30</property>
-                <property name="height_request">30</property>
-                <property name="visible">True</property>
-                <property name="can_focus">False</property>
-              </object>
-              <packing>
-                <property name="left_attach">3</property>
-                <property name="top_attach">3</property>
-                <property name="width">1</property>
-                <property name="height">1</property>
-              </packing>
-            </child>
       </object>
     </child>
   </object>

diff --git a/testsuite/reftests/grid-homogeneous.ui b/testsuite/reftests/grid-homogeneous.ui
index 4e40f2e4b3a87204d3e8f033d4c233bff27fcb72..43116e11d545c4253d482c1b101c35fb0e268b68 100644 (file)
--- a/testsuite/reftests/grid-homogeneous.ui
+++ b/testsuite/reftests/grid-homogeneous.ui
@@ -1,184 +1,156 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
-  <!-- interface-requires gtk+ 3.0 -->
   <object class="GtkWindow" id="window1">
     <property name="type">popup</property>
-    <property name="can_focus">False</property>
     <child>
       <object class="GtkGrid" id="grid1">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
         <child>
           <object class="GtkGrid" id="grid2">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <child>
               <object class="GtkBox" id="box1">
                 <property name="name">red</property>
                 <property name="width_request">30</property>
                 <property name="height_request">30</property>
-                <property name="visible">True</property>
-                <property name="can_focus">False</property>
+                <layout>
+                  <property name="left_attach">0</property>
+                  <property name="top_attach">0</property>
+                  <property name="column-span">1</property>
+                  <property name="row-span">1</property>
+                </layout>
               </object>
-              <packing>
-                <property name="left_attach">0</property>
-                <property name="top_attach">0</property>
-                <property name="width">1</property>
-                <property name="height">1</property>
-              </packing>
             </child>
             <child>
               <object class="GtkBox" id="box2">
                 <property name="name">green</property>
                 <property name="width_request">20</property>
                 <property name="height_request">20</property>
-                <property name="visible">True</property>
-                <property name="can_focus">False</property>
+                <layout>
+                  <property name="left_attach">1</property>
+                  <property name="top_attach">1</property>
+                  <property name="column-span">1</property>
+                  <property name="row-span">1</property>
+                </layout>
               </object>
-              <packing>
-                <property name="left_attach">1</property>
-                <property name="top_attach">1</property>
-                <property name="width">1</property>
-                <property name="height">1</property>
-              </packing>
             </child>
+            <layout>
+              <property name="left_attach">0</property>
+              <property name="top_attach">0</property>
+              <property name="column-span">1</property>
+              <property name="row-span">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">0</property>
-            <property name="top_attach">0</property>
-            <property name="width">1</property>
-            <property name="height">1</property>
-          </packing>
         </child>
         <child>
           <object class="GtkGrid" id="grid3">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
-            <property name="row_homogeneous">True</property>
+            <property name="row_homogeneous">1</property>
             <child>
               <object class="GtkBox" id="box3">
                 <property name="name">red</property>
                 <property name="width_request">30</property>
                 <property name="height_request">30</property>
-                <property name="visible">True</property>
-                <property name="can_focus">False</property>
+                <layout>
+                  <property name="left_attach">0</property>
+                  <property name="top_attach">0</property>
+                  <property name="column-span">1</property>
+                  <property name="row-span">1</property>
+                </layout>
               </object>
-              <packing>
-                <property name="left_attach">0</property>
-                <property name="top_attach">0</property>
-                <property name="width">1</property>
-                <property name="height">1</property>
-              </packing>
             </child>
             <child>
               <object class="GtkBox" id="box4">
                 <property name="name">green</property>
                 <property name="width_request">20</property>
                 <property name="height_request">20</property>
-                <property name="visible">True</property>
-                <property name="can_focus">False</property>
+                <layout>
+                  <property name="left_attach">1</property>
+                  <property name="top_attach">1</property>
+                  <property name="column-span">1</property>
+                  <property name="row-span">1</property>
+                </layout>
               </object>
-              <packing>
-                <property name="left_attach">1</property>
-                <property name="top_attach">1</property>
-                <property name="width">1</property>
-                <property name="height">1</property>
-              </packing>
             </child>
+            <layout>
+              <property name="left_attach">0</property>
+              <property name="top_attach">1</property>
+              <property name="column-span">1</property>
+              <property name="row-span">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">0</property>
-            <property name="top_attach">1</property>
-            <property name="width">1</property>
-            <property name="height">1</property>
-          </packing>
         </child>
         <child>
           <object class="GtkGrid" id="grid4">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
-            <property name="column_homogeneous">True</property>
+            <property name="column_homogeneous">1</property>
             <child>
               <object class="GtkBox" id="box5">
                 <property name="name">red</property>
                 <property name="width_request">30</property>
                 <property name="height_request">30</property>
-                <property name="visible">True</property>
-                <property name="can_focus">False</property>
+                <layout>
+                  <property name="left_attach">0</property>
+                  <property name="top_attach">0</property>
+                  <property name="column-span">1</property>
+                  <property name="row-span">1</property>
+                </layout>
               </object>
-              <packing>
-                <property name="left_attach">0</property>
-                <property name="top_attach">0</property>
-                <property name="width">1</property>
-                <property name="height">1</property>
-              </packing>
             </child>
             <child>
               <object class="GtkBox" id="box6">
                 <property name="name">green</property>
                 <property name="width_request">20</property>
                 <property name="height_request">20</property>
-                <property name="visible">True</property>
-                <property name="can_focus">False</property>
+                <layout>
+                  <property name="left_attach">1</property>
+                  <property name="top_attach">1</property>
+                  <property name="column-span">1</property>
+                  <property name="row-span">1</property>
+                </layout>
               </object>
-              <packing>
-                <property name="left_attach">1</property>
-                <property name="top_attach">1</property>
-                <property name="width">1</property>
-                <property name="height">1</property>
-              </packing>
             </child>
+            <layout>
+              <property name="left_attach">1</property>
+              <property name="top_attach">0</property>
+              <property name="column-span">1</property>
+              <property name="row-span">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">1</property>
-            <property name="top_attach">0</property>
-            <property name="width">1</property>
-            <property name="height">1</property>
-          </packing>
         </child>
         <child>
           <object class="GtkGrid" id="grid5">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
-            <property name="row_homogeneous">True</property>
-            <property name="column_homogeneous">True</property>
+            <property name="row_homogeneous">1</property>
+            <property name="column_homogeneous">1</property>
             <child>
               <object class="GtkBox" id="box7">
                 <property name="name">red</property>
                 <property name="width_request">30</property>
                 <property name="height_request">30</property>
-                <property name="visible">True</property>
-                <property name="can_focus">False</property>
+                <layout>
+                  <property name="left_attach">0</property>
+                  <property name="top_attach">0</property>
+                  <property name="column-span">1</property>
+                  <property name="row-span">1</property>
+                </layout>
               </object>
-              <packing>
-                <property name="left_attach">0</property>
-                <property name="top_attach">0</property>
-                <property name="width">1</property>
-                <property name="height">1</property>
-              </packing>
             </child>
             <child>
               <object class="GtkBox" id="box8">
                 <property name="name">green</property>
                 <property name="width_request">20</property>
                 <property name="height_request">20</property>
-                <property name="visible">True</property>
-                <property name="can_focus">False</property>
+                <layout>
+                  <property name="left_attach">1</property>
+                  <property name="top_attach">1</property>
+                  <property name="column-span">1</property>
+                  <property name="row-span">1</property>
+                </layout>
               </object>
-              <packing>
-                <property name="left_attach">1</property>
-                <property name="top_attach">1</property>
-                <property name="width">1</property>
-                <property name="height">1</property>
-              </packing>
             </child>
+            <layout>
+              <property name="left_attach">1</property>
+              <property name="top_attach">1</property>
+              <property name="column-span">1</property>
+              <property name="row-span">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">1</property>
-            <property name="top_attach">1</property>
-            <property name="width">1</property>
-            <property name="height">1</property>
-          </packing>
         </child>
       </object>
     </child>

diff --git a/testsuite/reftests/grid-spacing1.ref.ui b/testsuite/reftests/grid-spacing1.ref.ui
index 9e9ee1d5d89f8dc74a2a7a6cff9943a88fe72754..2faa9a0117b4186451f224f45954d79cd1f9c9b3 100644 (file)
--- a/testsuite/reftests/grid-spacing1.ref.ui
+++ b/testsuite/reftests/grid-spacing1.ref.ui
@@ -1,99 +1,65 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
-  <!-- interface-requires gtk+ 3.0 -->
   <object class="GtkWindow" id="window1">
-    <property name="can_focus">False</property>
     <property name="type">popup</property>
     <child>
       <object class="GtkBox" id="box">
         <property name="orientation">vertical</property>
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
         <child>
-          <!-- spacing -->
           <object class="GtkBox" id="box0">
-            <property name="orientation">horizontal</property>
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="spacing">20</property>
             <child>
               <object class="GtkLabel" id="one">
-                <property name="visible">True</property>
                 <property name="label">One</property>
               </object>
             </child>
             <child>
               <object class="GtkLabel" id="two">
-                <property name="visible">True</property>
                 <property name="label">Two</property>
               </object>
             </child>
             <child>
               <object class="GtkLabel" id="three">
-                <property name="visible">True</property>
                 <property name="label">Three</property>
               </object>
             </child>
           </object>
-          <packing>
-          </packing>
         </child>
-
         <child>
-          <!-- homogeneous -->
           <object class="GtkBox" id="box1">
-            <property name="orientation">horizontal</property>
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
-            <property name="spacing">0</property>
-            <property name="homogeneous">True</property>
+            <property name="homogeneous">1</property>
             <child>
               <object class="GtkLabel" id="long">
-                <property name="visible">True</property>
                 <property name="label">Verylongtext</property>
               </object>
             </child>
             <child>
               <object class="GtkLabel" id="short">
-                <property name="visible">True</property>
                 <property name="label">Short</property>
               </object>
             </child>
           </object>
-          <packing>
-          </packing>
         </child>
-
         <child>
-          <!-- expand -->
           <object class="GtkBox" id="box2">
-            <property name="orientation">horizontal</property>
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <child>
               <object class="GtkLabel" id="a">
-                <property name="visible">True</property>
                 <property name="label">A</property>
               </object>
             </child>
             <child>
               <object class="GtkLabel" id="b">
-                <property name="visible">True</property>
                 <property name="label">B</property>
-                <property name="hexpand">True</property>
+                <property name="hexpand">1</property>
               </object>
             </child>
             <child>
               <object class="GtkLabel" id="c">
-                <property name="visible">True</property>
                 <property name="label">C</property>
               </object>
             </child>
           </object>
-          <packing>
-          </packing>
         </child>
-
       </object>
     </child>
   </object>

diff --git a/testsuite/reftests/grid-spacing1.ui b/testsuite/reftests/grid-spacing1.ui
index eda8526a04002c400444080ec3de0183b89d3d17..004c62ed9d4ee76f884bb8fa6c8fbc1f83f62300 100644 (file)
--- a/testsuite/reftests/grid-spacing1.ui
+++ b/testsuite/reftests/grid-spacing1.ui
@@ -1,122 +1,100 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
-  <!-- interface-requires gtk+ 3.0 -->
   <object class="GtkWindow" id="window1">
-    <property name="can_focus">False</property>
     <property name="type">popup</property>
     <child>
       <object class="GtkGrid" id="grid">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
-
         <child>
           <object class="GtkGrid" id="grid0">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="column-spacing">20</property>
             <child>
               <object class="GtkLabel" id="one">
-                <property name="visible">True</property>
                 <property name="label">One</property>
+                <layout>
+                  <property name="left_attach">0</property>
+                </layout>
               </object>
-              <packing>
-                <property name="left_attach">0</property>
-              </packing>
             </child>
             <child>
               <object class="GtkLabel" id="two">
-                <property name="visible">True</property>
                 <property name="label">Two</property>
+                <layout>
+                  <property name="left_attach">1</property>
+                </layout>
               </object>
-              <packing>
-                <property name="left_attach">1</property>
-              </packing>
             </child>
             <child>
               <object class="GtkLabel" id="three">
-                <property name="visible">True</property>
                 <property name="label">Three</property>
+                <layout>
+                  <property name="left_attach">2</property>
+                </layout>
               </object>
-              <packing>
-                <property name="left_attach">2</property>
-              </packing>
             </child>
+            <layout>
+              <property name="left_attach">0</property>
+              <property name="top_attach">0</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">0</property>
-            <property name="top_attach">0</property>
-          </packing>
         </child>
-
         <child>
           <object class="GtkGrid" id="grid1">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
-            <property name="column-homogeneous">True</property>
+            <property name="column-homogeneous">1</property>
             <child>
               <object class="GtkLabel" id="long">
-                <property name="visible">True</property>
                 <property name="label">Verylongtext</property>
+                <layout>
+                  <property name="left_attach">0</property>
+                </layout>
               </object>
-              <packing>
-                <property name="left_attach">0</property>
-              </packing>
             </child>
             <child>
               <object class="GtkLabel" id="short">
-                <property name="visible">True</property>
                 <property name="label">Short</property>
+                <layout>
+                  <property name="left_attach">1</property>
+                </layout>
               </object>
-              <packing>
-                <property name="left_attach">1</property>
-              </packing>
             </child>
+            <layout>
+              <property name="left_attach">0</property>
+              <property name="top_attach">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">0</property>
-            <property name="top_attach">1</property>
-          </packing>
         </child>
-
         <child>
           <object class="GtkGrid" id="grid2">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <child>
               <object class="GtkLabel" id="a">
-                <property name="visible">True</property>
                 <property name="label">A</property>
+                <layout>
+                  <property name="left_attach">0</property>
+                </layout>
               </object>
-              <packing>
-                <property name="left_attach">0</property>
-              </packing>
             </child>
             <child>
               <object class="GtkLabel" id="b">
-                <property name="visible">True</property>
                 <property name="label">B</property>
-                <property name="hexpand">True</property>
+                <property name="hexpand">1</property>
+                <layout>
+                  <property name="left_attach">1</property>
+                </layout>
               </object>
-              <packing>
-                <property name="left_attach">1</property>
-              </packing>
             </child>
             <child>
               <object class="GtkLabel" id="c">
-                <property name="visible">True</property>
                 <property name="label">C</property>
+                <layout>
+                  <property name="left_attach">2</property>
+                </layout>
               </object>
-              <packing>
-                <property name="left_attach">2</property>
-              </packing>
             </child>
+            <layout>
+              <property name="left_attach">0</property>
+              <property name="top_attach">2</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">0</property>
-            <property name="top_attach">2</property>
-          </packing>
         </child>
-
       </object>
     </child>
   </object>

diff --git a/testsuite/reftests/grid-spacing2.ref.ui b/testsuite/reftests/grid-spacing2.ref.ui
index df79827b506abe545fde83d5e236a270a5583e46..c37863a8410dd998d4cb54ff57ba885f8c3ef397 100644 (file)
--- a/testsuite/reftests/grid-spacing2.ref.ui
+++ b/testsuite/reftests/grid-spacing2.ref.ui
@@ -1,93 +1,67 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
-  <!-- interface-requires gtk+ 3.0 -->
   <object class="GtkWindow" id="window1">
-    <property name="can_focus">False</property>
     <property name="type">popup</property>
     <child>
       <object class="GtkBox" id="box">
-        <property name="orientation">horizontal</property>
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
         <child>
-          <!-- spacing -->
           <object class="GtkBox" id="box0">
             <property name="orientation">vertical</property>
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="spacing">20</property>
             <child>
               <object class="GtkLabel" id="one">
-                <property name="visible">True</property>
                 <property name="label">One</property>
               </object>
             </child>
             <child>
               <object class="GtkLabel" id="two">
-                <property name="visible">True</property>
                 <property name="label">Two</property>
               </object>
             </child>
             <child>
               <object class="GtkLabel" id="three">
-                <property name="visible">True</property>
                 <property name="label">Three</property>
               </object>
             </child>
           </object>
         </child>
-
         <child>
-          <!-- homogeneous -->
           <object class="GtkBox" id="box1">
             <property name="orientation">vertical</property>
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
-            <property name="spacing">0</property>
-            <property name="homogeneous">True</property>
+            <property name="homogeneous">1</property>
             <child>
               <object class="GtkLabel" id="long">
-                <property name="visible">True</property>
                 <property name="label">Verylongtext</property>
               </object>
             </child>
             <child>
               <object class="GtkLabel" id="short">
-                <property name="visible">True</property>
                 <property name="label">Short</property>
               </object>
             </child>
           </object>
         </child>
-
-       <child>
-          <!-- expand -->
+        <child>
           <object class="GtkBox" id="box2">
             <property name="orientation">vertical</property>
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <child>
               <object class="GtkLabel" id="a">
-                <property name="visible">True</property>
                 <property name="label">A</property>
               </object>
             </child>
             <child>
               <object class="GtkLabel" id="b">
-                <property name="visible">True</property>
                 <property name="label">B</property>
                 <property name="vexpand">1</property>
               </object>
             </child>
             <child>
               <object class="GtkLabel" id="c">
-                <property name="visible">True</property>
                 <property name="label">C</property>
               </object>
             </child>
           </object>
         </child>
-
       </object>
     </child>
   </object>

diff --git a/testsuite/reftests/grid-spacing2.ui b/testsuite/reftests/grid-spacing2.ui
index 7688dc3f2b3d21a5d1fc361bfb992a6bfb905538..4c6fd8259b5fbeba4fef101eb36f73fa57ce8875 100644 (file)
--- a/testsuite/reftests/grid-spacing2.ui
+++ b/testsuite/reftests/grid-spacing2.ui
@@ -1,130 +1,108 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
-  <!-- interface-requires gtk+ 3.0 -->
   <object class="GtkWindow" id="window1">
-    <property name="can_focus">False</property>
     <property name="type">popup</property>
     <child>
       <object class="GtkGrid" id="grid">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
-
         <child>
           <object class="GtkGrid" id="grid0">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="row-spacing">20</property>
             <child>
               <object class="GtkLabel" id="one">
-                <property name="visible">True</property>
                 <property name="label">One</property>
+                <layout>
+                  <property name="left_attach">0</property>
+                  <property name="top_attach">0</property>
+                </layout>
               </object>
-              <packing>
-                <property name="left_attach">0</property>
-                <property name="top_attach">0</property>
-              </packing>
             </child>
             <child>
               <object class="GtkLabel" id="two">
-                <property name="visible">True</property>
                 <property name="label">Two</property>
+                <layout>
+                  <property name="left_attach">0</property>
+                  <property name="top_attach">1</property>
+                </layout>
               </object>
-              <packing>
-                <property name="left_attach">0</property>
-                <property name="top_attach">1</property>
-              </packing>
             </child>
             <child>
               <object class="GtkLabel" id="three">
-                <property name="visible">True</property>
                 <property name="label">Three</property>
+                <layout>
+                  <property name="left_attach">0</property>
+                  <property name="top_attach">2</property>
+                </layout>
               </object>
-              <packing>
-                <property name="left_attach">0</property>
-                <property name="top_attach">2</property>
-              </packing>
             </child>
+            <layout>
+              <property name="left_attach">0</property>
+              <property name="top_attach">0</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">0</property>
-            <property name="top_attach">0</property>
-          </packing>
         </child>
-
         <child>
           <object class="GtkGrid" id="grid1">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
-            <property name="row-homogeneous">True</property>
+            <property name="row-homogeneous">1</property>
             <child>
               <object class="GtkLabel" id="long">
-                <property name="visible">True</property>
                 <property name="label">Verylongtext</property>
+                <layout>
+                  <property name="left_attach">0</property>
+                  <property name="top_attach">0</property>
+                </layout>
               </object>
-              <packing>
-                <property name="left_attach">0</property>
-                <property name="top_attach">0</property>
-              </packing>
             </child>
             <child>
               <object class="GtkLabel" id="short">
-                <property name="visible">True</property>
                 <property name="label">Short</property>
+                <layout>
+                  <property name="left_attach">0</property>
+                  <property name="top_attach">1</property>
+                </layout>
               </object>
-              <packing>
-                <property name="left_attach">0</property>
-                <property name="top_attach">1</property>
-              </packing>
             </child>
+            <layout>
+              <property name="left_attach">1</property>
+              <property name="top_attach">0</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">1</property>
-            <property name="top_attach">0</property>
-          </packing>
         </child>
-
         <child>
           <object class="GtkGrid" id="grid3">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <child>
               <object class="GtkLabel" id="a">
-                <property name="visible">True</property>
                 <property name="label">A</property>
+                <layout>
+                  <property name="left_attach">0</property>
+                  <property name="top_attach">0</property>
+                </layout>
               </object>
-              <packing>
-                <property name="left_attach">0</property>
-                <property name="top_attach">0</property>
-              </packing>
             </child>
             <child>
               <object class="GtkLabel" id="b">
-                <property name="visible">True</property>
                 <property name="label">B</property>
-                <property name="vexpand">True</property>
+                <property name="vexpand">1</property>
+                <layout>
+                  <property name="left_attach">0</property>
+                  <property name="top_attach">1</property>
+                </layout>
               </object>
-              <packing>
-                <property name="left_attach">0</property>
-                <property name="top_attach">1</property>
-              </packing>
-           </child>
+            </child>
             <child>
               <object class="GtkLabel" id="c">
-                <property name="visible">True</property>
                 <property name="label">C</property>
+                <layout>
+                  <property name="left_attach">0</property>
+                  <property name="top_attach">2</property>
+                </layout>
               </object>
-              <packing>
-                <property name="left_attach">0</property>
-                <property name="top_attach">2</property>
-              </packing>
             </child>
+            <layout>
+              <property name="left_attach">2</property>
+              <property name="top_attach">0</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">2</property>
-            <property name="top_attach">0</property>
-          </packing>
         </child>
-
       </object>
     </child>
   </object>

diff --git a/testsuite/reftests/grid-spacing3.ref.ui b/testsuite/reftests/grid-spacing3.ref.ui
index 6638fc5138451bf6b52cee8f2c14d7e58e60b30b..9aaba615835ba514120cc3e85909b5686d8d3a21 100644 (file)
--- a/testsuite/reftests/grid-spacing3.ref.ui
+++ b/testsuite/reftests/grid-spacing3.ref.ui
@@ -1,13 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
-  <!-- interface-requires gtk+ 3.0 -->
   <object class="GtkWindow" id="window1">
     <property name="type">popup</property>
-    <property name="can_focus">False</property>
     <child>
       <object class="GtkGrid" id="grid1">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
         <property name="row-spacing">10</property>
         <property name="column-spacing">5</property>
         <child>
@@ -15,60 +11,52 @@
             <property name="name">red</property>
             <property name="width_request">30</property>
             <property name="height_request">30</property>
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
+            <layout>
+              <property name="left_attach">0</property>
+              <property name="top_attach">0</property>
+              <property name="column-span">1</property>
+              <property name="row-span">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">0</property>
-            <property name="top_attach">0</property>
-            <property name="width">1</property>
-            <property name="height">1</property>
-          </packing>
         </child>
         <child>
           <object class="GtkBox" id="box2">
             <property name="name">green</property>
             <property name="width_request">30</property>
             <property name="height_request">30</property>
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
+            <layout>
+              <property name="left_attach">1</property>
+              <property name="top_attach">0</property>
+              <property name="column-span">1</property>
+              <property name="row-span">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">1</property>
-            <property name="top_attach">0</property>
-            <property name="width">1</property>
-            <property name="height">1</property>
-          </packing>
         </child>
         <child>
           <object class="GtkBox" id="box3">
             <property name="name">green</property>
             <property name="width_request">30</property>
             <property name="height_request">30</property>
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
+            <layout>
+              <property name="left_attach">0</property>
+              <property name="top_attach">1</property>
+              <property name="column-span">1</property>
+              <property name="row-span">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">0</property>
-            <property name="top_attach">1</property>
-            <property name="width">1</property>
-            <property name="height">1</property>
-          </packing>
         </child>
         <child>
           <object class="GtkBox" id="box4">
             <property name="name">red</property>
             <property name="width_request">30</property>
             <property name="height_request">30</property>
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
+            <layout>
+              <property name="left_attach">1</property>
+              <property name="top_attach">1</property>
+              <property name="column-span">1</property>
+              <property name="row-span">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">1</property>
-            <property name="top_attach">1</property>
-            <property name="width">1</property>
-            <property name="height">1</property>
-          </packing>
         </child>
       </object>
     </child>

diff --git a/testsuite/reftests/grid-spacing3.ui b/testsuite/reftests/grid-spacing3.ui
index 5ddbea17bd714ff9e4c490621e7c653f3a0f7e6d..bf6f584ce24505908662a2b81a65eed1f44aa9bc 100644 (file)
--- a/testsuite/reftests/grid-spacing3.ui
+++ b/testsuite/reftests/grid-spacing3.ui
@@ -1,14 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
-  <!-- interface-requires gtk+ 3.0 -->
   <object class="GtkWindow" id="window1">
     <property name="type">popup</property>
-    <property name="can_focus">False</property>
     <child>
-      <!-- test that empty extra rows/columns don't affect layout -->
       <object class="GtkGrid" id="grid1">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
         <property name="row-spacing">10</property>
         <property name="column-spacing">5</property>
         <child>
@@ -16,60 +11,52 @@
             <property name="name">red</property>
             <property name="width_request">30</property>
             <property name="height_request">30</property>
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
+            <layout>
+              <property name="left_attach">0</property>
+              <property name="top_attach">0</property>
+              <property name="column-span">1</property>
+              <property name="row-span">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">0</property>
-            <property name="top_attach">0</property>
-            <property name="width">1</property>
-            <property name="height">1</property>
-          </packing>
         </child>
         <child>
           <object class="GtkBox" id="box2">
             <property name="name">green</property>
             <property name="width_request">30</property>
             <property name="height_request">30</property>
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
+            <layout>
+              <property name="left_attach">10</property>
+              <property name="top_attach">0</property>
+              <property name="column-span">1</property>
+              <property name="row-span">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">10</property>
-            <property name="top_attach">0</property>
-            <property name="width">1</property>
-            <property name="height">1</property>
-          </packing>
         </child>
         <child>
           <object class="GtkBox" id="box3">
             <property name="name">green</property>
             <property name="width_request">30</property>
             <property name="height_request">30</property>
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
+            <layout>
+              <property name="left_attach">0</property>
+              <property name="top_attach">10</property>
+              <property name="column-span">1</property>
+              <property name="row-span">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">0</property>
-            <property name="top_attach">10</property>
-            <property name="width">1</property>
-            <property name="height">1</property>
-          </packing>
         </child>
         <child>
           <object class="GtkBox" id="box4">
             <property name="name">red</property>
             <property name="width_request">30</property>
             <property name="height_request">30</property>
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
+            <layout>
+              <property name="left_attach">10</property>
+              <property name="top_attach">10</property>
+              <property name="column-span">1</property>
+              <property name="row-span">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">10</property>
-            <property name="top_attach">10</property>
-            <property name="width">1</property>
-            <property name="height">1</property>
-          </packing>
         </child>
       </object>
     </child>

diff --git a/testsuite/reftests/grid-wfh.ref.ui b/testsuite/reftests/grid-wfh.ref.ui
index f01a7d7ea06b7bfd8364bece291a8549be93caf6..ebea05d7e7688806c766ea9dc36aabb9b72da61c 100644 (file)
--- a/testsuite/reftests/grid-wfh.ref.ui
+++ b/testsuite/reftests/grid-wfh.ref.ui
@@ -1,38 +1,30 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
-  <!-- interface-requires gtk+ 3.0 -->
   <object class="GtkWindow" id="window1">
-    <property name="can_focus">False</property>
     <property name="type">popup</property>
     <child>
       <object class="GtkGrid" id="grid1">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
         <child>
           <object class="GtkLabel" id="label1">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="label" translatable="yes">GNOME is awesome!</property>
+            <layout>
+              <property name="left_attach">0</property>
+              <property name="top_attach">0</property>
+              <property name="column-span">1</property>
+              <property name="row-span">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">0</property>
-            <property name="top_attach">0</property>
-            <property name="width">1</property>
-            <property name="height">1</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="label4">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="label" translatable="yes">GNOME is awesome!</property>
+            <layout>
+              <property name="left_attach">0</property>
+              <property name="top_attach">1</property>
+              <property name="column-span">1</property>
+              <property name="row-span">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">0</property>
-            <property name="top_attach">1</property>
-            <property name="width">1</property>
-            <property name="height">1</property>
-          </packing>
         </child>
       </object>
     </child>

diff --git a/testsuite/reftests/grid-wfh.ui b/testsuite/reftests/grid-wfh.ui
index 8b252eabe9ca60fbd375db9d3f05457475d3e017..0e5396a7dd84bf8d485e38349be08e28ccf93b5b 100644 (file)
--- a/testsuite/reftests/grid-wfh.ui
+++ b/testsuite/reftests/grid-wfh.ui
@@ -1,39 +1,31 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
-  <!-- interface-requires gtk+ 3.0 -->
   <object class="GtkWindow" id="window1">
-    <property name="can_focus">False</property>
     <property name="type">popup</property>
     <child>
       <object class="GtkGrid" id="grid1">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
         <child>
           <object class="GtkLabel" id="label1">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="label" translatable="yes">GNOME is awesome!</property>
-            <property name="wrap">True</property>
+            <property name="wrap">1</property>
+            <layout>
+              <property name="left_attach">0</property>
+              <property name="top_attach">0</property>
+              <property name="column-span">1</property>
+              <property name="row-span">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">0</property>
-            <property name="top_attach">0</property>
-            <property name="width">1</property>
-            <property name="height">1</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="label4">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="label" translatable="yes">GNOME is awesome!</property>
+            <layout>
+              <property name="left_attach">0</property>
+              <property name="top_attach">1</property>
+              <property name="column-span">1</property>
+              <property name="row-span">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">0</property>
-            <property name="top_attach">1</property>
-            <property name="width">1</property>
-            <property name="height">1</property>
-          </packing>
         </child>
       </object>
     </child>

diff --git a/testsuite/reftests/gtk-icontheme-sizing.ref.ui b/testsuite/reftests/gtk-icontheme-sizing.ref.ui
index 5f99d6bfb98b6e6d936e110c631194b4a1ee0fda..d93b42a01412f92a6de45b925a44d3e2586daa4a 100644 (file)
--- a/testsuite/reftests/gtk-icontheme-sizing.ref.ui
+++ b/testsuite/reftests/gtk-icontheme-sizing.ref.ui
@@ -1,14 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!-- Generated with glade 3.18.1 -->
 <interface>
   <requires lib="gtk+" version="3.12"/>
   <object class="GtkWindow" id="window1">
-    <property name="can_focus">False</property>
     <property name="type">popup</property>
     <child>
       <object class="GtkImage" id="image1">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
         <property name="pixel_size">100</property>
         <property name="icon_name">pan-down-symbolic</property>
       </object>

diff --git a/testsuite/reftests/gtk-icontheme-sizing.ui b/testsuite/reftests/gtk-icontheme-sizing.ui
index 0d0015ec3b511dfec629cc95b759fe922255e783..c1a1e6014bed98e8829bcb119f62482cc24422d5 100644 (file)
--- a/testsuite/reftests/gtk-icontheme-sizing.ui
+++ b/testsuite/reftests/gtk-icontheme-sizing.ui
@@ -1,16 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!-- Generated with glade 3.18.1 -->
 <interface>
   <requires lib="gtk+" version="3.12"/>
   <object class="GtkWindow" id="window1">
     <property name="width_request">100</property>
     <property name="height_request">100</property>
-    <property name="can_focus">False</property>
     <property name="type">popup</property>
     <child>
       <object class="GtkBox" id="box1">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
         <property name="orientation">vertical</property>
         <child>
           <placeholder/>

diff --git a/testsuite/reftests/gtk-image-effect-inherit.ref.ui b/testsuite/reftests/gtk-image-effect-inherit.ref.ui
index 37bb2e2ca0c8b0b4958204aea3b5311fdbe6ea0c..cc0482913b6145bdb2275144cce45735344d2a8c 100644 (file)
--- a/testsuite/reftests/gtk-image-effect-inherit.ref.ui
+++ b/testsuite/reftests/gtk-image-effect-inherit.ref.ui
@@ -1,32 +1,21 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!-- Generated with glade 3.15.2 on Sat Sep  7 00:14:31 2013 -->
 <interface>
-  <!-- interface-requires gtk+ 3.10 -->
   <object class="GtkWindow" id="window1">
-    <property name="can_focus">False</property>
     <property name="type">popup</property>
     <child>
       <object class="GtkBox" id="box1">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
         <child>
           <object class="GtkImage" id="image1">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="icon_name">dialog-error</property>
           </object>
         </child>
         <child>
           <object class="GtkImage" id="image2">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="icon_name">dialog-error</property>
           </object>
         </child>
         <child>
           <object class="GtkImage" id="image3">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="icon_name">dialog-error</property>
           </object>
         </child>

diff --git a/testsuite/reftests/gtk-image-effect-inherit.ui b/testsuite/reftests/gtk-image-effect-inherit.ui
index e41a30a6fe923571499e92343a70ac0f39cdd91c..6ef4925023bb332e6f3f6ec76d937df05118b5f4 100644 (file)
--- a/testsuite/reftests/gtk-image-effect-inherit.ui
+++ b/testsuite/reftests/gtk-image-effect-inherit.ui
@@ -1,68 +1,51 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!-- Generated with glade 3.15.2 on Sat Sep  7 00:18:08 2013 -->
 <interface>
-  <!-- interface-requires gtk+ 3.10 -->
   <object class="GtkWindow" id="window1">
-    <property name="can_focus">False</property>
     <property name="type">popup</property>
     <child>
       <object class="GtkBox" id="box1">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
         <child>
           <object class="GtkGrid" id="grid1">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <child>
               <object class="GtkImage" id="image1">
-                <property name="visible">True</property>
-                <property name="can_focus">False</property>
                 <property name="icon_name">dialog-error</property>
+                <layout>
+                  <property name="left_attach">0</property>
+                  <property name="top_attach">0</property>
+                  <property name="column-span">1</property>
+                  <property name="row-span">1</property>
+                </layout>
               </object>
-              <packing>
-                <property name="left_attach">0</property>
-                <property name="top_attach">0</property>
-                <property name="width">1</property>
-                <property name="height">1</property>
-              </packing>
             </child>
           </object>
         </child>
         <child>
           <object class="GtkGrid" id="grid2">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <child>
               <object class="GtkImage" id="image2">
-                <property name="visible">True</property>
-                <property name="can_focus">False</property>
                 <property name="icon_name">dialog-error</property>
+                <layout>
+                  <property name="left_attach">0</property>
+                  <property name="top_attach">0</property>
+                  <property name="column-span">1</property>
+                  <property name="row-span">1</property>
+                </layout>
               </object>
-              <packing>
-                <property name="left_attach">0</property>
-                <property name="top_attach">0</property>
-                <property name="width">1</property>
-                <property name="height">1</property>
-              </packing>
             </child>
           </object>
         </child>
         <child>
           <object class="GtkGrid" id="grid3">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <child>
               <object class="GtkImage" id="image3">
-                <property name="visible">True</property>
-                <property name="can_focus">False</property>
                 <property name="icon_name">dialog-error</property>
+                <layout>
+                  <property name="left_attach">0</property>
+                  <property name="top_attach">0</property>
+                  <property name="column-span">1</property>
+                  <property name="row-span">1</property>
+                </layout>
               </object>
-              <packing>
-                <property name="left_attach">0</property>
-                <property name="top_attach">0</property>
-                <property name="width">1</property>
-                <property name="height">1</property>
-              </packing>
             </child>
           </object>
         </child>

diff --git a/testsuite/reftests/icon-effect-missing.ref.ui b/testsuite/reftests/icon-effect-missing.ref.ui
index 5cf6418e101cbddcd74864592cab899217fc925e..92000974423cbbb13ed9e2a3a3e1844ef43abd46 100644 (file)
--- a/testsuite/reftests/icon-effect-missing.ref.ui
+++ b/testsuite/reftests/icon-effect-missing.ref.ui
@@ -1,32 +1,22 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!-- Generated with glade 3.19.0 -->
 <interface>
   <requires lib="gtk+" version="3.16"/>
   <object class="GtkWindow" id="window1">
-    <property name="can_focus">False</property>
     <property name="type">popup</property>
     <child>
       <object class="GtkBox" id="box1">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
         <child>
           <object class="GtkImage" id="image1">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="icon_name">image-missing</property>
           </object>
         </child>
         <child>
           <object class="GtkImage" id="image2">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="icon_name">image-missing</property>
           </object>
         </child>
         <child>
           <object class="GtkImage" id="image3">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="icon_name">image-missing</property>
           </object>
         </child>

diff --git a/testsuite/reftests/icon-effect-missing.ui b/testsuite/reftests/icon-effect-missing.ui
index 3ef84e9b075b04e5831b01abbbcbc9bf9886b389..5d432aec96b15f41e468065a076ce92bc041ae7e 100644 (file)
--- a/testsuite/reftests/icon-effect-missing.ui
+++ b/testsuite/reftests/icon-effect-missing.ui
@@ -1,32 +1,22 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!-- Generated with glade 3.19.0 -->
 <interface>
   <requires lib="gtk+" version="3.16"/>
   <object class="GtkWindow" id="window1">
-    <property name="can_focus">False</property>
     <property name="type">popup</property>
     <child>
       <object class="GtkBox" id="box1">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
         <child>
           <object class="GtkImage" id="image1">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="icon_name">deine-mudda-gibs-hier-nich</property>
           </object>
         </child>
         <child>
           <object class="GtkImage" id="image2">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="icon_name">deine-mudda-gibs-hier-nich</property>
           </object>
         </child>
         <child>
           <object class="GtkImage" id="image3">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="icon_name">deine-mudda-gibs-hier-nich</property>
           </object>
         </child>

diff --git a/testsuite/reftests/icon-shadow-no-transform.ref.ui b/testsuite/reftests/icon-shadow-no-transform.ref.ui
index e8329becdd40cf6dfc4793a642a69228046d0e66..b8c3d8157ca04cd4e243b0bdaaab06315290d51c 100644 (file)
--- a/testsuite/reftests/icon-shadow-no-transform.ref.ui
+++ b/testsuite/reftests/icon-shadow-no-transform.ref.ui
@@ -1,15 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!-- Generated with glade 3.18.1 -->
 <interface>
   <requires lib="gtk+" version="3.12"/>
   <object class="GtkWindow" id="window1">
-    <property name="can_focus">False</property>
     <property name="type">popup</property>
     <child>
-      <object class="GtkSpinner" id="spinner1">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
-      </object>
+      <object class="GtkSpinner" id="spinner1"/>
     </child>
   </object>
 </interface>

diff --git a/testsuite/reftests/icon-shadow-no-transform.ui b/testsuite/reftests/icon-shadow-no-transform.ui
index c2279402844d4b5555573bbe800a6c305e51ae0c..503a8b03937ac37d084b997c10a4a1fa06ad4f88 100644 (file)
--- a/testsuite/reftests/icon-shadow-no-transform.ui
+++ b/testsuite/reftests/icon-shadow-no-transform.ui
@@ -1,14 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!-- Generated with glade 3.18.1 -->
 <interface>
   <requires lib="gtk+" version="3.12"/>
   <object class="GtkWindow" id="window1">
-    <property name="can_focus">False</property>
     <property name="type">popup</property>
     <child>
       <object class="GtkSpinner" id="spinner1">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
         <style>
           <class name="transformed"/>
         </style>

diff --git a/testsuite/reftests/icon-style-basics.ref.ui b/testsuite/reftests/icon-style-basics.ref.ui
index 7b9fd4516d6bedeea6d142a640c3fc6e9616084c..edf7842d9a92a8a7200f36b35d1913ecbb04013b 100644 (file)
--- a/testsuite/reftests/icon-style-basics.ref.ui
+++ b/testsuite/reftests/icon-style-basics.ref.ui
@@ -1,10 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!-- Generated with glade 3.18.1 -->
 <interface>
   <requires lib="gtk+" version="3.12"/>
   <object class="GtkListStore" id="liststore1">
     <columns>
-      <!-- column-name strings -->
       <column type="gchararray"/>
     </columns>
     <data>
@@ -14,108 +12,87 @@
     </data>
   </object>
   <object class="GtkWindow" id="window1">
-    <property name="can_focus">False</property>
     <property name="type">popup</property>
     <child>
       <object class="GtkGrid" id="grid1">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
         <child>
           <object class="GtkImage" id="image1">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="icon_name">edit-delete</property>
+            <layout>
+              <property name="left_attach">1</property>
+              <property name="top_attach">0</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">1</property>
-            <property name="top_attach">0</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="label1">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="label" translatable="yes">icon name</property>
+            <layout>
+              <property name="left_attach">0</property>
+              <property name="top_attach">0</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">0</property>
-            <property name="top_attach">0</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="label2">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="label" translatable="yes">symbolic icon name</property>
+            <layout>
+              <property name="left_attach">0</property>
+              <property name="top_attach">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">0</property>
-            <property name="top_attach">1</property>
-          </packing>
         </child>
         <child>
           <object class="GtkImage" id="image2">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="icon_name">edit-delete</property>
+            <layout>
+              <property name="left_attach">2</property>
+              <property name="top_attach">0</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">2</property>
-            <property name="top_attach">0</property>
-          </packing>
         </child>
         <child>
           <object class="GtkImage" id="image3">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="icon_name">edit-delete-symbolic</property>
+            <layout>
+              <property name="left_attach">3</property>
+              <property name="top_attach">0</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">3</property>
-            <property name="top_attach">0</property>
-          </packing>
         </child>
         <child>
           <object class="GtkImage" id="image4">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="icon_name">edit-delete-symbolic</property>
+            <layout>
+              <property name="left_attach">1</property>
+              <property name="top_attach">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">1</property>
-            <property name="top_attach">1</property>
-          </packing>
         </child>
         <child>
           <object class="GtkImage" id="image5">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="icon_name">edit-delete</property>
+            <layout>
+              <property name="left_attach">2</property>
+              <property name="top_attach">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">2</property>
-            <property name="top_attach">1</property>
-          </packing>
         </child>
         <child>
           <object class="GtkImage" id="image6">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="icon_name">edit-delete-symbolic</property>
+            <layout>
+              <property name="left_attach">3</property>
+              <property name="top_attach">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">3</property>
-            <property name="top_attach">1</property>
-          </packing>
         </child>
         <child>
           <object class="GtkTreeView" id="treeview1">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="model">liststore1</property>
-            <property name="headers_visible">False</property>
-            <property name="enable_search">False</property>
-            <property name="show_expanders">False</property>
+            <property name="headers_visible">0</property>
+            <property name="enable_search">0</property>
+            <property name="show_expanders">0</property>
             <child internal-child="selection">
               <object class="GtkTreeSelection" id="treeview-selection1"/>
             </child>
@@ -129,21 +106,19 @@
                 </child>
               </object>
             </child>
+            <layout>
+              <property name="left_attach">4</property>
+              <property name="top_attach">0</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">4</property>
-            <property name="top_attach">0</property>
-          </packing>
         </child>
         <child>
           <object class="GtkTreeView" id="treeview2">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="model">liststore1</property>
-            <property name="headers_visible">False</property>
-            <property name="enable_search">False</property>
+            <property name="headers_visible">0</property>
+            <property name="enable_search">0</property>
             <property name="search_column">0</property>
-            <property name="show_expanders">False</property>
+            <property name="show_expanders">0</property>
             <child internal-child="selection">
               <object class="GtkTreeSelection" id="treeview-selection3"/>
             </child>
@@ -157,21 +132,19 @@
                 </child>
               </object>
             </child>
+            <layout>
+              <property name="left_attach">5</property>
+              <property name="top_attach">0</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">5</property>
-            <property name="top_attach">0</property>
-          </packing>
         </child>
         <child>
           <object class="GtkTreeView" id="treeview3">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="model">liststore1</property>
-            <property name="headers_visible">False</property>
-            <property name="enable_search">False</property>
+            <property name="headers_visible">0</property>
+            <property name="enable_search">0</property>
             <property name="search_column">0</property>
-            <property name="show_expanders">False</property>
+            <property name="show_expanders">0</property>
             <child internal-child="selection">
               <object class="GtkTreeSelection" id="treeview-selection4"/>
             </child>
@@ -185,21 +158,19 @@
                 </child>
               </object>
             </child>
+            <layout>
+              <property name="left_attach">6</property>
+              <property name="top_attach">0</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">6</property>
-            <property name="top_attach">0</property>
-          </packing>
         </child>
         <child>
           <object class="GtkTreeView" id="treeview4">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="model">liststore1</property>
-            <property name="headers_visible">False</property>
-            <property name="enable_search">False</property>
+            <property name="headers_visible">0</property>
+            <property name="enable_search">0</property>
             <property name="search_column">0</property>
-            <property name="show_expanders">False</property>
+            <property name="show_expanders">0</property>
             <child internal-child="selection">
               <object class="GtkTreeSelection" id="treeview-selection6"/>
             </child>
@@ -213,21 +184,19 @@
                 </child>
               </object>
             </child>
+            <layout>
+              <property name="left_attach">4</property>
+              <property name="top_attach">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">4</property>
-            <property name="top_attach">1</property>
-          </packing>
         </child>
         <child>
           <object class="GtkTreeView" id="treeview5">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="model">liststore1</property>
-            <property name="headers_visible">False</property>
-            <property name="enable_search">False</property>
+            <property name="headers_visible">0</property>
+            <property name="enable_search">0</property>
             <property name="search_column">0</property>
-            <property name="show_expanders">False</property>
+            <property name="show_expanders">0</property>
             <child internal-child="selection">
               <object class="GtkTreeSelection" id="treeview-selection8"/>
             </child>
@@ -241,21 +210,19 @@
                 </child>
               </object>
             </child>
+            <layout>
+              <property name="left_attach">5</property>
+              <property name="top_attach">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">5</property>
-            <property name="top_attach">1</property>
-          </packing>
         </child>
         <child>
           <object class="GtkTreeView" id="treeview6">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="model">liststore1</property>
-            <property name="headers_visible">False</property>
-            <property name="enable_search">False</property>
+            <property name="headers_visible">0</property>
+            <property name="enable_search">0</property>
             <property name="search_column">0</property>
-            <property name="show_expanders">False</property>
+            <property name="show_expanders">0</property>
             <child internal-child="selection">
               <object class="GtkTreeSelection" id="treeview-selection9"/>
             </child>
@@ -269,197 +236,163 @@
                 </child>
               </object>
             </child>
+            <layout>
+              <property name="left_attach">6</property>
+              <property name="top_attach">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">6</property>
-            <property name="top_attach">1</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="label3">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="label" translatable="yes">GThemedIcon</property>
+            <layout>
+              <property name="left_attach">0</property>
+              <property name="top_attach">2</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">0</property>
-            <property name="top_attach">2</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="label4">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="label" translatable="yes">symbolic GThemedIcon</property>
+            <layout>
+              <property name="left_attach">0</property>
+              <property name="top_attach">3</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">0</property>
-            <property name="top_attach">3</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="label5">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="label" translatable="yes">GEmeblemedIcon</property>
+            <layout>
+              <property name="left_attach">0</property>
+              <property name="top_attach">4</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">0</property>
-            <property name="top_attach">4</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="label6">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="label" translatable="yes">symbolic GEmblemedIcon</property>
+            <layout>
+              <property name="left_attach">0</property>
+              <property name="top_attach">5</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">0</property>
-            <property name="top_attach">5</property>
-          </packing>
         </child>
         <child>
           <object class="GtkImage" id="image7">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="gicon">themediconsymbolic</property>
+            <layout>
+              <property name="left_attach">1</property>
+              <property name="top_attach">3</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">1</property>
-            <property name="top_attach">3</property>
-          </packing>
         </child>
         <child>
           <object class="GtkImage" id="image8">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="gicon">themedicon</property>
+            <layout>
+              <property name="left_attach">1</property>
+              <property name="top_attach">2</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">1</property>
-            <property name="top_attach">2</property>
-          </packing>
         </child>
         <child>
           <object class="GtkImage" id="image9">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="gicon">emblemedicon</property>
+            <layout>
+              <property name="left_attach">1</property>
+              <property name="top_attach">4</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">1</property>
-            <property name="top_attach">4</property>
-          </packing>
         </child>
         <child>
           <object class="GtkImage" id="image10">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="gicon">emblemediconsymbolic</property>
+            <layout>
+              <property name="left_attach">1</property>
+              <property name="top_attach">5</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">1</property>
-            <property name="top_attach">5</property>
-          </packing>
         </child>
         <child>
           <object class="GtkImage" id="image11">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="gicon">themedicon</property>
+            <layout>
+              <property name="left_attach">2</property>
+              <property name="top_attach">2</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">2</property>
-            <property name="top_attach">2</property>
-          </packing>
         </child>
         <child>
           <object class="GtkImage" id="image12">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="gicon">themedicon</property>
+            <layout>
+              <property name="left_attach">2</property>
+              <property name="top_attach">3</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">2</property>
-            <property name="top_attach">3</property>
-          </packing>
         </child>
         <child>
           <object class="GtkImage" id="image13">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="gicon">emblemedicon</property>
+            <layout>
+              <property name="left_attach">2</property>
+              <property name="top_attach">4</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">2</property>
-            <property name="top_attach">4</property>
-          </packing>
         </child>
         <child>
           <object class="GtkImage" id="image14">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="gicon">emblemedicon</property>
+            <layout>
+              <property name="left_attach">2</property>
+              <property name="top_attach">5</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">2</property>
-            <property name="top_attach">5</property>
-          </packing>
         </child>
         <child>
           <object class="GtkImage" id="image15">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="gicon">themediconsymbolic</property>
+            <layout>
+              <property name="left_attach">3</property>
+              <property name="top_attach">2</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">3</property>
-            <property name="top_attach">2</property>
-          </packing>
         </child>
         <child>
           <object class="GtkImage" id="image16">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="gicon">themediconsymbolic</property>
+            <layout>
+              <property name="left_attach">3</property>
+              <property name="top_attach">3</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">3</property>
-            <property name="top_attach">3</property>
-          </packing>
         </child>
         <child>
           <object class="GtkImage" id="image17">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="gicon">emblemediconsymbolic</property>
+            <layout>
+              <property name="left_attach">3</property>
+              <property name="top_attach">4</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">3</property>
-            <property name="top_attach">4</property>
-          </packing>
         </child>
         <child>
           <object class="GtkImage" id="image18">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="gicon">emblemediconsymbolic</property>
+            <layout>
+              <property name="left_attach">3</property>
+              <property name="top_attach">5</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">3</property>
-            <property name="top_attach">5</property>
-          </packing>
         </child>
         <child>
           <object class="GtkTreeView" id="treeview7">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="model">liststore1</property>
-            <property name="headers_visible">False</property>
-            <property name="enable_search">False</property>
+            <property name="headers_visible">0</property>
+            <property name="enable_search">0</property>
             <property name="search_column">0</property>
-            <property name="show_expanders">False</property>
+            <property name="show_expanders">0</property>
             <child internal-child="selection">
               <object class="GtkTreeSelection" id="treeview-selection10"/>
             </child>
@@ -473,21 +406,19 @@
                 </child>
               </object>
             </child>
+            <layout>
+              <property name="left_attach">4</property>
+              <property name="top_attach">2</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">4</property>
-            <property name="top_attach">2</property>
-          </packing>
         </child>
         <child>
           <object class="GtkTreeView" id="treeview8">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="model">liststore1</property>
-            <property name="headers_visible">False</property>
-            <property name="enable_search">False</property>
+            <property name="headers_visible">0</property>
+            <property name="enable_search">0</property>
             <property name="search_column">0</property>
-            <property name="show_expanders">False</property>
+            <property name="show_expanders">0</property>
             <child internal-child="selection">
               <object class="GtkTreeSelection" id="treeview-selection11"/>
             </child>
@@ -501,21 +432,19 @@
                 </child>
               </object>
             </child>
+            <layout>
+              <property name="left_attach">4</property>
+              <property name="top_attach">3</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">4</property>
-            <property name="top_attach">3</property>
-          </packing>
         </child>
         <child>
           <object class="GtkTreeView" id="treeview9">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="model">liststore1</property>
-            <property name="headers_visible">False</property>
-            <property name="enable_search">False</property>
+            <property name="headers_visible">0</property>
+            <property name="enable_search">0</property>
             <property name="search_column">0</property>
-            <property name="show_expanders">False</property>
+            <property name="show_expanders">0</property>
             <child internal-child="selection">
               <object class="GtkTreeSelection" id="treeview-selection12"/>
             </child>
@@ -529,21 +458,19 @@
                 </child>
               </object>
             </child>
+            <layout>
+              <property name="left_attach">4</property>
+              <property name="top_attach">4</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">4</property>
-            <property name="top_attach">4</property>
-          </packing>
         </child>
         <child>
           <object class="GtkTreeView" id="treeview10">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="model">liststore1</property>
-            <property name="headers_visible">False</property>
-            <property name="enable_search">False</property>
+            <property name="headers_visible">0</property>
+            <property name="enable_search">0</property>
             <property name="search_column">0</property>
-            <property name="show_expanders">False</property>
+            <property name="show_expanders">0</property>
             <child internal-child="selection">
               <object class="GtkTreeSelection" id="treeview-selection13"/>
             </child>
@@ -557,21 +484,19 @@
                 </child>
               </object>
             </child>
+            <layout>
+              <property name="left_attach">4</property>
+              <property name="top_attach">5</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">4</property>
-            <property name="top_attach">5</property>
-          </packing>
         </child>
         <child>
           <object class="GtkTreeView" id="treeview11">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="model">liststore1</property>
-            <property name="headers_visible">False</property>
-            <property name="enable_search">False</property>
+            <property name="headers_visible">0</property>
+            <property name="enable_search">0</property>
             <property name="search_column">0</property>
-            <property name="show_expanders">False</property>
+            <property name="show_expanders">0</property>
             <child internal-child="selection">
               <object class="GtkTreeSelection" id="treeview-selection15"/>
             </child>
@@ -585,21 +510,19 @@
                 </child>
               </object>
             </child>
+            <layout>
+              <property name="left_attach">5</property>
+              <property name="top_attach">2</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">5</property>
-            <property name="top_attach">2</property>
-          </packing>
         </child>
         <child>
           <object class="GtkTreeView" id="treeview12">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="model">liststore1</property>
-            <property name="headers_visible">False</property>
-            <property name="enable_search">False</property>
+            <property name="headers_visible">0</property>
+            <property name="enable_search">0</property>
             <property name="search_column">0</property>
-            <property name="show_expanders">False</property>
+            <property name="show_expanders">0</property>
             <child internal-child="selection">
               <object class="GtkTreeSelection" id="treeview-selection16"/>
             </child>
@@ -613,21 +536,19 @@
                 </child>
               </object>
             </child>
+            <layout>
+              <property name="left_attach">5</property>
+              <property name="top_attach">3</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">5</property>
-            <property name="top_attach">3</property>
-          </packing>
         </child>
         <child>
           <object class="GtkTreeView" id="treeview13">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="model">liststore1</property>
-            <property name="headers_visible">False</property>
-            <property name="enable_search">False</property>
+            <property name="headers_visible">0</property>
+            <property name="enable_search">0</property>
             <property name="search_column">0</property>
-            <property name="show_expanders">False</property>
+            <property name="show_expanders">0</property>
             <child internal-child="selection">
               <object class="GtkTreeSelection" id="treeview-selection17"/>
             </child>
@@ -641,21 +562,19 @@
                 </child>
               </object>
             </child>
+            <layout>
+              <property name="left_attach">5</property>
+              <property name="top_attach">4</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">5</property>
-            <property name="top_attach">4</property>
-          </packing>
         </child>
         <child>
           <object class="GtkTreeView" id="treeview14">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="model">liststore1</property>
-            <property name="headers_visible">False</property>
-            <property name="enable_search">False</property>
+            <property name="headers_visible">0</property>
+            <property name="enable_search">0</property>
             <property name="search_column">0</property>
-            <property name="show_expanders">False</property>
+            <property name="show_expanders">0</property>
             <child internal-child="selection">
               <object class="GtkTreeSelection" id="treeview-selection18"/>
             </child>
@@ -669,21 +588,19 @@
                 </child>
               </object>
             </child>
+            <layout>
+              <property name="left_attach">5</property>
+              <property name="top_attach">5</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">5</property>
-            <property name="top_attach">5</property>
-          </packing>
         </child>
         <child>
           <object class="GtkTreeView" id="treeview15">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="model">liststore1</property>
-            <property name="headers_visible">False</property>
-            <property name="enable_search">False</property>
+            <property name="headers_visible">0</property>
+            <property name="enable_search">0</property>
             <property name="search_column">0</property>
-            <property name="show_expanders">False</property>
+            <property name="show_expanders">0</property>
             <child internal-child="selection">
               <object class="GtkTreeSelection" id="treeview-selection20"/>
             </child>
@@ -697,21 +614,19 @@
                 </child>
               </object>
             </child>
+            <layout>
+              <property name="left_attach">6</property>
+              <property name="top_attach">2</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">6</property>
-            <property name="top_attach">2</property>
-          </packing>
         </child>
         <child>
           <object class="GtkTreeView" id="treeview16">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="model">liststore1</property>
-            <property name="headers_visible">False</property>
-            <property name="enable_search">False</property>
+            <property name="headers_visible">0</property>
+            <property name="enable_search">0</property>
             <property name="search_column">0</property>
-            <property name="show_expanders">False</property>
+            <property name="show_expanders">0</property>
             <child internal-child="selection">
               <object class="GtkTreeSelection" id="treeview-selection21"/>
             </child>
@@ -725,21 +640,19 @@
                 </child>
               </object>
             </child>
+            <layout>
+              <property name="left_attach">6</property>
+              <property name="top_attach">3</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">6</property>
-            <property name="top_attach">3</property>
-          </packing>
         </child>
         <child>
           <object class="GtkTreeView" id="treeview17">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="model">liststore1</property>
-            <property name="headers_visible">False</property>
-            <property name="enable_search">False</property>
+            <property name="headers_visible">0</property>
+            <property name="enable_search">0</property>
             <property name="search_column">0</property>
-            <property name="show_expanders">False</property>
+            <property name="show_expanders">0</property>
             <child internal-child="selection">
               <object class="GtkTreeSelection" id="treeview-selection22"/>
             </child>
@@ -753,21 +666,19 @@
                 </child>
               </object>
             </child>
+            <layout>
+              <property name="left_attach">6</property>
+              <property name="top_attach">4</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">6</property>
-            <property name="top_attach">4</property>
-          </packing>
         </child>
         <child>
           <object class="GtkTreeView" id="treeview18">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="model">liststore1</property>
-            <property name="headers_visible">False</property>
-            <property name="enable_search">False</property>
+            <property name="headers_visible">0</property>
+            <property name="enable_search">0</property>
             <property name="search_column">0</property>
-            <property name="show_expanders">False</property>
+            <property name="show_expanders">0</property>
             <child internal-child="selection">
               <object class="GtkTreeSelection" id="treeview-selection23"/>
             </child>
@@ -781,11 +692,11 @@
                 </child>
               </object>
             </child>
+            <layout>
+              <property name="left_attach">6</property>
+              <property name="top_attach">5</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">6</property>
-            <property name="top_attach">5</property>
-          </packing>
         </child>
       </object>
     </child>

diff --git a/testsuite/reftests/icon-style-basics.ui b/testsuite/reftests/icon-style-basics.ui
index 689cfab21324da5eba0a79d76adbad38e20ef1e8..1d4c07f6de19f13f6a26dcdc977c7fa5d50e16c4 100644 (file)
--- a/testsuite/reftests/icon-style-basics.ui
+++ b/testsuite/reftests/icon-style-basics.ui
@@ -1,10 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!-- Generated with glade 3.18.1 -->
 <interface>
   <requires lib="gtk+" version="3.12"/>
   <object class="GtkListStore" id="liststore1">
     <columns>
-      <!-- column-name strings -->
       <column type="gchararray"/>
     </columns>
     <data>
@@ -14,120 +12,99 @@
     </data>
   </object>
   <object class="GtkWindow" id="window1">
-    <property name="can_focus">False</property>
     <property name="type">popup</property>
     <child>
       <object class="GtkGrid" id="grid1">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
         <child>
           <object class="GtkImage" id="image1">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="icon_name">edit-delete</property>
+            <layout>
+              <property name="left_attach">1</property>
+              <property name="top_attach">0</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">1</property>
-            <property name="top_attach">0</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="label1">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="label" translatable="yes">icon name</property>
+            <layout>
+              <property name="left_attach">0</property>
+              <property name="top_attach">0</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">0</property>
-            <property name="top_attach">0</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="label2">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="label" translatable="yes">symbolic icon name</property>
+            <layout>
+              <property name="left_attach">0</property>
+              <property name="top_attach">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">0</property>
-            <property name="top_attach">1</property>
-          </packing>
         </child>
         <child>
           <object class="GtkImage" id="image2">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="icon_name">edit-delete</property>
             <style>
               <class name="regular"/>
             </style>
+            <layout>
+              <property name="left_attach">2</property>
+              <property name="top_attach">0</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">2</property>
-            <property name="top_attach">0</property>
-          </packing>
         </child>
         <child>
           <object class="GtkImage" id="image3">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="icon_name">edit-delete</property>
             <style>
               <class name="symbolic"/>
             </style>
+            <layout>
+              <property name="left_attach">3</property>
+              <property name="top_attach">0</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">3</property>
-            <property name="top_attach">0</property>
-          </packing>
         </child>
         <child>
           <object class="GtkImage" id="image4">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="icon_name">edit-delete-symbolic</property>
+            <layout>
+              <property name="left_attach">1</property>
+              <property name="top_attach">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">1</property>
-            <property name="top_attach">1</property>
-          </packing>
         </child>
         <child>
           <object class="GtkImage" id="image5">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="icon_name">edit-delete-symbolic</property>
             <style>
               <class name="regular"/>
             </style>
+            <layout>
+              <property name="left_attach">2</property>
+              <property name="top_attach">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">2</property>
-            <property name="top_attach">1</property>
-          </packing>
         </child>
         <child>
           <object class="GtkImage" id="image6">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="icon_name">edit-delete-symbolic</property>
             <style>
               <class name="symbolic"/>
             </style>
+            <layout>
+              <property name="left_attach">3</property>
+              <property name="top_attach">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">3</property>
-            <property name="top_attach">1</property>
-          </packing>
         </child>
         <child>
           <object class="GtkTreeView" id="treeview1">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="model">liststore1</property>
-            <property name="headers_visible">False</property>
-            <property name="enable_search">False</property>
-            <property name="show_expanders">False</property>
+            <property name="headers_visible">0</property>
+            <property name="enable_search">0</property>
+            <property name="show_expanders">0</property>
             <child internal-child="selection">
               <object class="GtkTreeSelection" id="treeview-selection1"/>
             </child>
@@ -141,21 +118,19 @@
                 </child>
               </object>
             </child>
+            <layout>
+              <property name="left_attach">4</property>
+              <property name="top_attach">0</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">4</property>
-            <property name="top_attach">0</property>
-          </packing>
         </child>
         <child>
           <object class="GtkTreeView" id="treeview2">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="model">liststore1</property>
-            <property name="headers_visible">False</property>
-            <property name="enable_search">False</property>
+            <property name="headers_visible">0</property>
+            <property name="enable_search">0</property>
             <property name="search_column">0</property>
-            <property name="show_expanders">False</property>
+            <property name="show_expanders">0</property>
             <child internal-child="selection">
               <object class="GtkTreeSelection" id="treeview-selection3"/>
             </child>
@@ -172,21 +147,19 @@
             <style>
               <class name="regular"/>
             </style>
+            <layout>
+              <property name="left_attach">5</property>
+              <property name="top_attach">0</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">5</property>
-            <property name="top_attach">0</property>
-          </packing>
         </child>
         <child>
           <object class="GtkTreeView" id="treeview3">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="model">liststore1</property>
-            <property name="headers_visible">False</property>
-            <property name="enable_search">False</property>
+            <property name="headers_visible">0</property>
+            <property name="enable_search">0</property>
             <property name="search_column">0</property>
-            <property name="show_expanders">False</property>
+            <property name="show_expanders">0</property>
             <child internal-child="selection">
               <object class="GtkTreeSelection" id="treeview-selection4"/>
             </child>
@@ -203,21 +176,19 @@
             <style>
               <class name="symbolic"/>
             </style>
+            <layout>
+              <property name="left_attach">6</property>
+              <property name="top_attach">0</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">6</property>
-            <property name="top_attach">0</property>
-          </packing>
         </child>
         <child>
           <object class="GtkTreeView" id="treeview4">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="model">liststore1</property>
-            <property name="headers_visible">False</property>
-            <property name="enable_search">False</property>
+            <property name="headers_visible">0</property>
+            <property name="enable_search">0</property>
             <property name="search_column">0</property>
-            <property name="show_expanders">False</property>
+            <property name="show_expanders">0</property>
             <child internal-child="selection">
               <object class="GtkTreeSelection" id="treeview-selection6"/>
             </child>
@@ -231,21 +202,19 @@
                 </child>
               </object>
             </child>
+            <layout>
+              <property name="left_attach">4</property>
+              <property name="top_attach">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">4</property>
-            <property name="top_attach">1</property>
-          </packing>
         </child>
         <child>
           <object class="GtkTreeView" id="treeview5">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="model">liststore1</property>
-            <property name="headers_visible">False</property>
-            <property name="enable_search">False</property>
+            <property name="headers_visible">0</property>
+            <property name="enable_search">0</property>
             <property name="search_column">0</property>
-            <property name="show_expanders">False</property>
+            <property name="show_expanders">0</property>
             <child internal-child="selection">
               <object class="GtkTreeSelection" id="treeview-selection8"/>
             </child>
@@ -262,21 +231,19 @@
             <style>
               <class name="regular"/>
             </style>
+            <layout>
+              <property name="left_attach">5</property>
+              <property name="top_attach">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">5</property>
-            <property name="top_attach">1</property>
-          </packing>
         </child>
         <child>
           <object class="GtkTreeView" id="treeview6">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="model">liststore1</property>
-            <property name="headers_visible">False</property>
-            <property name="enable_search">False</property>
+            <property name="headers_visible">0</property>
+            <property name="enable_search">0</property>
             <property name="search_column">0</property>
-            <property name="show_expanders">False</property>
+            <property name="show_expanders">0</property>
             <child internal-child="selection">
               <object class="GtkTreeSelection" id="treeview-selection9"/>
             </child>
@@ -293,221 +260,187 @@
             <style>
               <class name="symbolic"/>
             </style>
+            <layout>
+              <property name="left_attach">6</property>
+              <property name="top_attach">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">6</property>
-            <property name="top_attach">1</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="label3">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="label" translatable="yes">GThemedIcon</property>
+            <layout>
+              <property name="left_attach">0</property>
+              <property name="top_attach">2</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">0</property>
-            <property name="top_attach">2</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="label4">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="label" translatable="yes">symbolic GThemedIcon</property>
+            <layout>
+              <property name="left_attach">0</property>
+              <property name="top_attach">3</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">0</property>
-            <property name="top_attach">3</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="label5">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="label" translatable="yes">GEmeblemedIcon</property>
+            <layout>
+              <property name="left_attach">0</property>
+              <property name="top_attach">4</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">0</property>
-            <property name="top_attach">4</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="label6">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="label" translatable="yes">symbolic GEmblemedIcon</property>
+            <layout>
+              <property name="left_attach">0</property>
+              <property name="top_attach">5</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">0</property>
-            <property name="top_attach">5</property>
-          </packing>
         </child>
         <child>
           <object class="GtkImage" id="image7">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="gicon">themediconsymbolic</property>
+            <layout>
+              <property name="left_attach">1</property>
+              <property name="top_attach">3</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">1</property>
-            <property name="top_attach">3</property>
-          </packing>
         </child>
         <child>
           <object class="GtkImage" id="image8">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="gicon">themedicon</property>
+            <layout>
+              <property name="left_attach">1</property>
+              <property name="top_attach">2</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">1</property>
-            <property name="top_attach">2</property>
-          </packing>
         </child>
         <child>
           <object class="GtkImage" id="image9">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="gicon">emblemedicon</property>
+            <layout>
+              <property name="left_attach">1</property>
+              <property name="top_attach">4</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">1</property>
-            <property name="top_attach">4</property>
-          </packing>
         </child>
         <child>
           <object class="GtkImage" id="image10">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="gicon">emblemediconsymbolic</property>
+            <layout>
+              <property name="left_attach">1</property>
+              <property name="top_attach">5</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">1</property>
-            <property name="top_attach">5</property>
-          </packing>
         </child>
         <child>
           <object class="GtkImage" id="image11">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="gicon">themedicon</property>
             <style>
               <class name="regular"/>
             </style>
+            <layout>
+              <property name="left_attach">2</property>
+              <property name="top_attach">2</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">2</property>
-            <property name="top_attach">2</property>
-          </packing>
         </child>
         <child>
           <object class="GtkImage" id="image12">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="gicon">themediconsymbolic</property>
             <style>
               <class name="regular"/>
             </style>
+            <layout>
+              <property name="left_attach">2</property>
+              <property name="top_attach">3</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">2</property>
-            <property name="top_attach">3</property>
-          </packing>
         </child>
         <child>
           <object class="GtkImage" id="image13">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="gicon">emblemedicon</property>
             <style>
               <class name="regular"/>
             </style>
+            <layout>
+              <property name="left_attach">2</property>
+              <property name="top_attach">4</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">2</property>
-            <property name="top_attach">4</property>
-          </packing>
         </child>
         <child>
           <object class="GtkImage" id="image14">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="gicon">emblemediconsymbolic</property>
             <style>
               <class name="regular"/>
             </style>
+            <layout>
+              <property name="left_attach">2</property>
+              <property name="top_attach">5</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">2</property>
-            <property name="top_attach">5</property>
-          </packing>
         </child>
         <child>
           <object class="GtkImage" id="image15">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="gicon">themedicon</property>
             <style>
               <class name="symbolic"/>
             </style>
+            <layout>
+              <property name="left_attach">3</property>
+              <property name="top_attach">2</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">3</property>
-            <property name="top_attach">2</property>
-          </packing>
         </child>
         <child>
           <object class="GtkImage" id="image16">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="gicon">themediconsymbolic</property>
             <style>
               <class name="symbolic"/>
             </style>
+            <layout>
+              <property name="left_attach">3</property>
+              <property name="top_attach">3</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">3</property>
-            <property name="top_attach">3</property>
-          </packing>
         </child>
         <child>
           <object class="GtkImage" id="image17">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="gicon">emblemedicon</property>
             <style>
               <class name="symbolic"/>
             </style>
+            <layout>
+              <property name="left_attach">3</property>
+              <property name="top_attach">4</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">3</property>
-            <property name="top_attach">4</property>
-          </packing>
         </child>
         <child>
           <object class="GtkImage" id="image18">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="gicon">emblemediconsymbolic</property>
             <style>
               <class name="symbolic"/>
             </style>
+            <layout>
+              <property name="left_attach">3</property>
+              <property name="top_attach">5</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">3</property>
-            <property name="top_attach">5</property>
-          </packing>
         </child>
         <child>
           <object class="GtkTreeView" id="treeview7">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="model">liststore1</property>
-            <property name="headers_visible">False</property>
-            <property name="enable_search">False</property>
+            <property name="headers_visible">0</property>
+            <property name="enable_search">0</property>
             <property name="search_column">0</property>
-            <property name="show_expanders">False</property>
+            <property name="show_expanders">0</property>
             <child internal-child="selection">
               <object class="GtkTreeSelection" id="treeview-selection10"/>
             </child>
@@ -521,21 +454,19 @@
                 </child>
               </object>
             </child>
+            <layout>
+              <property name="left_attach">4</property>
+              <property name="top_attach">2</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">4</property>
-            <property name="top_attach">2</property>
-          </packing>
         </child>
         <child>
           <object class="GtkTreeView" id="treeview8">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="model">liststore1</property>
-            <property name="headers_visible">False</property>
-            <property name="enable_search">False</property>
+            <property name="headers_visible">0</property>
+            <property name="enable_search">0</property>
             <property name="search_column">0</property>
-            <property name="show_expanders">False</property>
+            <property name="show_expanders">0</property>
             <child internal-child="selection">
               <object class="GtkTreeSelection" id="treeview-selection11"/>
             </child>
@@ -549,21 +480,19 @@
                 </child>
               </object>
             </child>
+            <layout>
+              <property name="left_attach">4</property>
+              <property name="top_attach">3</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">4</property>
-            <property name="top_attach">3</property>
-          </packing>
         </child>
         <child>
           <object class="GtkTreeView" id="treeview9">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="model">liststore1</property>
-            <property name="headers_visible">False</property>
-            <property name="enable_search">False</property>
+            <property name="headers_visible">0</property>
+            <property name="enable_search">0</property>
             <property name="search_column">0</property>
-            <property name="show_expanders">False</property>
+            <property name="show_expanders">0</property>
             <child internal-child="selection">
               <object class="GtkTreeSelection" id="treeview-selection12"/>
             </child>
@@ -577,21 +506,19 @@
                 </child>
               </object>
             </child>
+            <layout>
+              <property name="left_attach">4</property>
+              <property name="top_attach">4</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">4</property>
-            <property name="top_attach">4</property>
-          </packing>
         </child>
         <child>
           <object class="GtkTreeView" id="treeview10">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="model">liststore1</property>
-            <property name="headers_visible">False</property>
-            <property name="enable_search">False</property>
+            <property name="headers_visible">0</property>
+            <property name="enable_search">0</property>
             <property name="search_column">0</property>
-            <property name="show_expanders">False</property>
+            <property name="show_expanders">0</property>
             <child internal-child="selection">
               <object class="GtkTreeSelection" id="treeview-selection13"/>
             </child>
@@ -605,21 +532,19 @@
                 </child>
               </object>
             </child>
+            <layout>
+              <property name="left_attach">4</property>
+              <property name="top_attach">5</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">4</property>
-            <property name="top_attach">5</property>
-          </packing>
         </child>
         <child>
           <object class="GtkTreeView" id="treeview11">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="model">liststore1</property>
-            <property name="headers_visible">False</property>
-            <property name="enable_search">False</property>
+            <property name="headers_visible">0</property>
+            <property name="enable_search">0</property>
             <property name="search_column">0</property>
-            <property name="show_expanders">False</property>
+            <property name="show_expanders">0</property>
             <child internal-child="selection">
               <object class="GtkTreeSelection" id="treeview-selection15"/>
             </child>
@@ -636,21 +561,19 @@
             <style>
               <class name="regular"/>
             </style>
+            <layout>
+              <property name="left_attach">5</property>
+              <property name="top_attach">2</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">5</property>
-            <property name="top_attach">2</property>
-          </packing>
         </child>
         <child>
           <object class="GtkTreeView" id="treeview12">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="model">liststore1</property>
-            <property name="headers_visible">False</property>
-            <property name="enable_search">False</property>
+            <property name="headers_visible">0</property>
+            <property name="enable_search">0</property>
             <property name="search_column">0</property>
-            <property name="show_expanders">False</property>
+            <property name="show_expanders">0</property>
             <child internal-child="selection">
               <object class="GtkTreeSelection" id="treeview-selection16"/>
             </child>
@@ -667,21 +590,19 @@
             <style>
               <class name="regular"/>
             </style>
+            <layout>
+              <property name="left_attach">5</property>
+              <property name="top_attach">3</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">5</property>
-            <property name="top_attach">3</property>
-          </packing>
         </child>
         <child>
           <object class="GtkTreeView" id="treeview13">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="model">liststore1</property>
-            <property name="headers_visible">False</property>
-            <property name="enable_search">False</property>
+            <property name="headers_visible">0</property>
+            <property name="enable_search">0</property>
             <property name="search_column">0</property>
-            <property name="show_expanders">False</property>
+            <property name="show_expanders">0</property>
             <child internal-child="selection">
               <object class="GtkTreeSelection" id="treeview-selection17"/>
             </child>
@@ -698,21 +619,19 @@
             <style>
               <class name="regular"/>
             </style>
+            <layout>
+              <property name="left_attach">5</property>
+              <property name="top_attach">4</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">5</property>
-            <property name="top_attach">4</property>
-          </packing>
         </child>
         <child>
           <object class="GtkTreeView" id="treeview14">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="model">liststore1</property>
-            <property name="headers_visible">False</property>
-            <property name="enable_search">False</property>
+            <property name="headers_visible">0</property>
+            <property name="enable_search">0</property>
             <property name="search_column">0</property>
-            <property name="show_expanders">False</property>
+            <property name="show_expanders">0</property>
             <child internal-child="selection">
               <object class="GtkTreeSelection" id="treeview-selection18"/>
             </child>
@@ -729,21 +648,19 @@
             <style>
               <class name="regular"/>
             </style>
+            <layout>
+              <property name="left_attach">5</property>
+              <property name="top_attach">5</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">5</property>
-            <property name="top_attach">5</property>
-          </packing>
         </child>
         <child>
           <object class="GtkTreeView" id="treeview15">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="model">liststore1</property>
-            <property name="headers_visible">False</property>
-            <property name="enable_search">False</property>
+            <property name="headers_visible">0</property>
+            <property name="enable_search">0</property>
             <property name="search_column">0</property>
-            <property name="show_expanders">False</property>
+            <property name="show_expanders">0</property>
             <child internal-child="selection">
               <object class="GtkTreeSelection" id="treeview-selection20"/>
             </child>
@@ -760,21 +677,19 @@
             <style>
               <class name="symbolic"/>
             </style>
+            <layout>
+              <property name="left_attach">6</property>
+              <property name="top_attach">2</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">6</property>
-            <property name="top_attach">2</property>
-          </packing>
         </child>
         <child>
           <object class="GtkTreeView" id="treeview16">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="model">liststore1</property>
-            <property name="headers_visible">False</property>
-            <property name="enable_search">False</property>
+            <property name="headers_visible">0</property>
+            <property name="enable_search">0</property>
             <property name="search_column">0</property>
-            <property name="show_expanders">False</property>
+            <property name="show_expanders">0</property>
             <child internal-child="selection">
               <object class="GtkTreeSelection" id="treeview-selection21"/>
             </child>
@@ -791,21 +706,19 @@
             <style>
               <class name="symbolic"/>
             </style>
+            <layout>
+              <property name="left_attach">6</property>
+              <property name="top_attach">3</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">6</property>
-            <property name="top_attach">3</property>
-          </packing>
         </child>
         <child>
           <object class="GtkTreeView" id="treeview17">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="model">liststore1</property>
-            <property name="headers_visible">False</property>
-            <property name="enable_search">False</property>
+            <property name="headers_visible">0</property>
+            <property name="enable_search">0</property>
             <property name="search_column">0</property>
-            <property name="show_expanders">False</property>
+            <property name="show_expanders">0</property>
             <child internal-child="selection">
               <object class="GtkTreeSelection" id="treeview-selection22"/>
             </child>
@@ -822,21 +735,19 @@
             <style>
               <class name="symbolic"/>
             </style>
+            <layout>
+              <property name="left_attach">6</property>
+              <property name="top_attach">4</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">6</property>
-            <property name="top_attach">4</property>
-          </packing>
         </child>
         <child>
           <object class="GtkTreeView" id="treeview18">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="model">liststore1</property>
-            <property name="headers_visible">False</property>
-            <property name="enable_search">False</property>
+            <property name="headers_visible">0</property>
+            <property name="enable_search">0</property>
             <property name="search_column">0</property>
-            <property name="show_expanders">False</property>
+            <property name="show_expanders">0</property>
             <child internal-child="selection">
               <object class="GtkTreeSelection" id="treeview-selection23"/>
             </child>
@@ -853,11 +764,11 @@
             <style>
               <class name="symbolic"/>
             </style>
+            <layout>
+              <property name="left_attach">6</property>
+              <property name="top_attach">5</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">6</property>
-            <property name="top_attach">5</property>
-          </packing>
         </child>
       </object>
     </child>

diff --git a/testsuite/reftests/icon-vfuncs.ref.ui b/testsuite/reftests/icon-vfuncs.ref.ui
index eb9e712f32258d50da21ced245410987a6dd8e30..d0103a01b38090c75bd8627df2a3f75d6148a3fc 100644 (file)
--- a/testsuite/reftests/icon-vfuncs.ref.ui
+++ b/testsuite/reftests/icon-vfuncs.ref.ui
@@ -1,67 +1,53 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!-- Generated with glade 3.18.1 -->
 <interface>
   <requires lib="gtk+" version="3.12"/>
   <object class="GtkWindow" id="window1">
-    <property name="can_focus">False</property>
     <child>
       <object class="GtkGrid" id="grid1">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
         <child>
           <object class="GtkLabel" id="label1">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="label" translatable="yes">Spinner</property>
+            <layout>
+              <property name="left_attach">0</property>
+              <property name="top_attach">0</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">0</property>
-            <property name="top_attach">0</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="label2">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="label" translatable="yes">Check</property>
+            <layout>
+              <property name="left_attach">0</property>
+              <property name="top_attach">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">0</property>
-            <property name="top_attach">1</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="label3">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="label" translatable="yes">Option</property>
+            <layout>
+              <property name="left_attach">0</property>
+              <property name="top_attach">2</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">0</property>
-            <property name="top_attach">2</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="label4">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="label" translatable="yes">Arrow</property>
+            <layout>
+              <property name="left_attach">0</property>
+              <property name="top_attach">3</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">0</property>
-            <property name="top_attach">3</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="label5">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="label" translatable="yes">Expander</property>
+            <layout>
+              <property name="left_attach">0</property>
+              <property name="top_attach">4</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">0</property>
-            <property name="top_attach">4</property>
-          </packing>
         </child>
         <child>
           <object class="GtkImage" id="image1">
@@ -69,13 +55,11 @@
             <property name="height_request">16</property>
             <property name="halign">center</property>
             <property name="valign">center</property>
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
+            <layout>
+              <property name="left_attach">1</property>
+              <property name="top_attach">0</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">1</property>
-            <property name="top_attach">0</property>
-          </packing>
         </child>
         <child>
           <object class="GtkImage" id="image2">
@@ -83,13 +67,11 @@
             <property name="height_request">16</property>
             <property name="halign">center</property>
             <property name="valign">center</property>
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
+            <layout>
+              <property name="left_attach">1</property>
+              <property name="top_attach">2</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">1</property>
-            <property name="top_attach">2</property>
-          </packing>
         </child>
         <child>
           <object class="GtkImage" id="image3">
@@ -97,13 +79,11 @@
             <property name="height_request">16</property>
             <property name="halign">center</property>
             <property name="valign">center</property>
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
+            <layout>
+              <property name="left_attach">1</property>
+              <property name="top_attach">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">1</property>
-            <property name="top_attach">1</property>
-          </packing>
         </child>
         <child>
           <object class="GtkImage" id="image4">
@@ -111,13 +91,11 @@
             <property name="height_request">16</property>
             <property name="halign">center</property>
             <property name="valign">center</property>
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
+            <layout>
+              <property name="left_attach">1</property>
+              <property name="top_attach">3</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">1</property>
-            <property name="top_attach">3</property>
-          </packing>
         </child>
         <child>
           <object class="GtkImage" id="image5">
@@ -125,13 +103,11 @@
             <property name="height_request">16</property>
             <property name="halign">center</property>
             <property name="valign">center</property>
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
+            <layout>
+              <property name="left_attach">1</property>
+              <property name="top_attach">4</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">1</property>
-            <property name="top_attach">4</property>
-          </packing>
         </child>
       </object>
     </child>

diff --git a/testsuite/reftests/icon-vfuncs.ui b/testsuite/reftests/icon-vfuncs.ui
index f2f215a5d388809af4c075770143ae671836349d..bab70ba24a3f136965a94c3a01f839af4762e79c 100644 (file)
--- a/testsuite/reftests/icon-vfuncs.ui
+++ b/testsuite/reftests/icon-vfuncs.ui
@@ -1,126 +1,101 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!-- Generated with glade 3.18.1 -->
 <interface>
   <requires lib="gtk+" version="3.12"/>
   <object class="GtkWindow" id="window1">
-    <property name="can_focus">False</property>
     <child>
       <object class="GtkGrid" id="grid1">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
         <child>
           <object class="GtkLabel" id="label1">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="label" translatable="yes">Spinner</property>
+            <layout>
+              <property name="left_attach">0</property>
+              <property name="top_attach">0</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">0</property>
-            <property name="top_attach">0</property>
-          </packing>
         </child>
         <child>
           <object class="GtkSpinner" id="spinner1">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="halign">center</property>
             <property name="valign">center</property>
+            <layout>
+              <property name="left_attach">1</property>
+              <property name="top_attach">0</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">1</property>
-            <property name="top_attach">0</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="label2">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="label" translatable="yes">Check</property>
+            <layout>
+              <property name="left_attach">0</property>
+              <property name="top_attach">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">0</property>
-            <property name="top_attach">1</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="label3">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="label" translatable="yes">Option</property>
+            <layout>
+              <property name="left_attach">0</property>
+              <property name="top_attach">2</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">0</property>
-            <property name="top_attach">2</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="label4">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="label" translatable="yes">Arrow</property>
+            <layout>
+              <property name="left_attach">0</property>
+              <property name="top_attach">3</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">0</property>
-            <property name="top_attach">3</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="label5">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="label" translatable="yes">Expander</property>
+            <layout>
+              <property name="left_attach">0</property>
+              <property name="top_attach">4</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">0</property>
-            <property name="top_attach">4</property>
-          </packing>
         </child>
         <child>
           <object class="GtkCheckButton" id="checkbutton1">
-            <property name="visible">True</property>
-            <property name="can_focus">True</property>
-            <property name="receives_default">False</property>
-            <property name="draw_indicator">True</property>
+            <property name="can_focus">1</property>
             <property name="halign">center</property>
             <property name="valign">center</property>
+            <layout>
+              <property name="left_attach">1</property>
+              <property name="top_attach">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">1</property>
-            <property name="top_attach">1</property>
-          </packing>
         </child>
         <child>
           <object class="GtkRadioButton" id="radiobutton1">
-            <property name="visible">True</property>
-            <property name="can_focus">True</property>
-            <property name="receives_default">False</property>
-            <property name="active">True</property>
-            <property name="draw_indicator">True</property>
+            <property name="can_focus">1</property>
+            <property name="active">1</property>
             <property name="halign">center</property>
             <property name="valign">center</property>
+            <layout>
+              <property name="left_attach">1</property>
+              <property name="top_attach">2</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">1</property>
-            <property name="top_attach">2</property>
-          </packing>
         </child>
         <child>
           <object class="GtkImage" id="arrow1">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="icon_name">pan-down-symbolic</property>
             <property name="halign">center</property>
             <property name="valign">center</property>
+            <layout>
+              <property name="left_attach">1</property>
+              <property name="top_attach">3</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">1</property>
-            <property name="top_attach">3</property>
-          </packing>
         </child>
         <child>
           <object class="GtkExpander" id="expander1">
-            <property name="visible">True</property>
-            <property name="can_focus">True</property>
+            <property name="can_focus">1</property>
             <property name="halign">center</property>
             <property name="valign">center</property>
             <child>
@@ -129,11 +104,11 @@
             <child type="label_item">
               <placeholder/>
             </child>
+            <layout>
+              <property name="left_attach">1</property>
+              <property name="top_attach">4</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">1</property>
-            <property name="top_attach">4</property>
-          </packing>
         </child>
       </object>
     </child>

diff --git a/testsuite/reftests/iconview-empty.ref.ui b/testsuite/reftests/iconview-empty.ref.ui
index 9e0c3c580bb22885f4bdf39199f300d2a6531af3..2ec7dcb5024499901a7857dece558e46e9f0d33b 100644 (file)
--- a/testsuite/reftests/iconview-empty.ref.ui
+++ b/testsuite/reftests/iconview-empty.ref.ui
@@ -1,270 +1,234 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
-  <!-- interface-requires gtk+ 3.0 -->
   <object class="GtkWindow" id="window">
-    <property name="can_focus">False</property>
     <property name="type">popup</property>
     <child>
       <object class="GtkGrid" id="grid">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
         <property name="row_spacing">5</property>
         <property name="column_spacing">5</property>
         <child>
           <object class="GtkPicture" id="picture-0-0">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="halign">center</property>
             <property name="valign">center</property>
             <property name="width-request">0</property>
             <property name="height-request">0</property>
+            <layout>
+              <property name="left_attach">0</property>
+              <property name="top_attach">0</property>
+              <property name="column-span">1</property>
+              <property name="row-span">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">0</property>
-            <property name="top_attach">0</property>
-            <property name="width">1</property>
-            <property name="height">1</property>
-          </packing>
         </child>
         <child>
           <object class="GtkPicture" id="picture-1-0">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="halign">center</property>
             <property name="valign">center</property>
             <property name="width-request">0</property>
             <property name="height-request">0</property>
+            <layout>
+              <property name="left_attach">1</property>
+              <property name="top_attach">0</property>
+              <property name="column-span">1</property>
+              <property name="row-span">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">1</property>
-            <property name="top_attach">0</property>
-            <property name="width">1</property>
-            <property name="height">1</property>
-          </packing>
         </child>
         <child>
           <object class="GtkPicture" id="picture-2-0">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="halign">center</property>
             <property name="valign">center</property>
             <property name="width-request">0</property>
             <property name="height-request">0</property>
+            <layout>
+              <property name="left_attach">2</property>
+              <property name="top_attach">0</property>
+              <property name="column-span">1</property>
+              <property name="row-span">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">2</property>
-            <property name="top_attach">0</property>
-            <property name="width">1</property>
-            <property name="height">1</property>
-          </packing>
         </child>
         <child>
           <object class="GtkPicture" id="picture-3-0">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="halign">center</property>
             <property name="valign">center</property>
             <property name="width-request">0</property>
             <property name="height-request">0</property>
+            <layout>
+              <property name="left_attach">3</property>
+              <property name="top_attach">0</property>
+              <property name="column-span">1</property>
+              <property name="row-span">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">3</property>
-            <property name="top_attach">0</property>
-            <property name="width">1</property>
-            <property name="height">1</property>
-          </packing>
         </child>
         <child>
           <object class="GtkPicture" id="picture-0-1">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="halign">center</property>
             <property name="valign">center</property>
             <property name="width-request">0</property>
             <property name="height-request">0</property>
+            <layout>
+              <property name="left_attach">0</property>
+              <property name="top_attach">1</property>
+              <property name="column-span">1</property>
+              <property name="row-span">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">0</property>
-            <property name="top_attach">1</property>
-            <property name="width">1</property>
-            <property name="height">1</property>
-          </packing>
         </child>
         <child>
           <object class="GtkPicture" id="picture-1-1">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="halign">center</property>
             <property name="valign">center</property>
             <property name="width-request">0</property>
             <property name="height-request">0</property>
+            <layout>
+              <property name="left_attach">1</property>
+              <property name="top_attach">1</property>
+              <property name="column-span">1</property>
+              <property name="row-span">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">1</property>
-            <property name="top_attach">1</property>
-            <property name="width">1</property>
-            <property name="height">1</property>
-          </packing>
         </child>
         <child>
           <object class="GtkPicture" id="picture-2-1">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="halign">center</property>
             <property name="valign">center</property>
             <property name="width-request">0</property>
             <property name="height-request">0</property>
+            <layout>
+              <property name="left_attach">2</property>
+              <property name="top_attach">1</property>
+              <property name="column-span">1</property>
+              <property name="row-span">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">2</property>
-            <property name="top_attach">1</property>
-            <property name="width">1</property>
-            <property name="height">1</property>
-          </packing>
         </child>
         <child>
           <object class="GtkPicture" id="picture-3-1">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="halign">center</property>
             <property name="valign">center</property>
             <property name="width-request">0</property>
             <property name="height-request">0</property>
+            <layout>
+              <property name="left_attach">3</property>
+              <property name="top_attach">1</property>
+              <property name="column-span">1</property>
+              <property name="row-span">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">3</property>
-            <property name="top_attach">1</property>
-            <property name="width">1</property>
-            <property name="height">1</property>
-          </packing>
         </child>
         <child>
           <object class="GtkPicture" id="picture-0-2">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="halign">center</property>
             <property name="valign">center</property>
             <property name="width-request">10</property>
             <property name="height-request">10</property>
+            <layout>
+              <property name="left_attach">0</property>
+              <property name="top_attach">2</property>
+              <property name="column-span">1</property>
+              <property name="row-span">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">0</property>
-            <property name="top_attach">2</property>
-            <property name="width">1</property>
-            <property name="height">1</property>
-          </packing>
         </child>
         <child>
           <object class="GtkPicture" id="picture-1-2">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="halign">center</property>
             <property name="valign">center</property>
             <property name="width-request">10</property>
             <property name="height-request">10</property>
+            <layout>
+              <property name="left_attach">1</property>
+              <property name="top_attach">2</property>
+              <property name="column-span">1</property>
+              <property name="row-span">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">1</property>
-            <property name="top_attach">2</property>
-            <property name="width">1</property>
-            <property name="height">1</property>
-          </packing>
         </child>
         <child>
           <object class="GtkPicture" id="picture-2-2">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="halign">center</property>
             <property name="valign">center</property>
             <property name="width-request">10</property>
             <property name="height-request">10</property>
+            <layout>
+              <property name="left_attach">2</property>
+              <property name="top_attach">2</property>
+              <property name="column-span">1</property>
+              <property name="row-span">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">2</property>
-            <property name="top_attach">2</property>
-            <property name="width">1</property>
-            <property name="height">1</property>
-          </packing>
         </child>
         <child>
           <object class="GtkPicture" id="picture-3-2">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="halign">center</property>
             <property name="valign">center</property>
             <property name="width-request">10</property>
             <property name="height-request">10</property>
+            <layout>
+              <property name="left_attach">3</property>
+              <property name="top_attach">2</property>
+              <property name="column-span">1</property>
+              <property name="row-span">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">3</property>
-            <property name="top_attach">2</property>
-            <property name="width">1</property>
-            <property name="height">1</property>
-          </packing>
         </child>
         <child>
           <object class="GtkPicture" id="picture-0-3">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="halign">center</property>
             <property name="valign">center</property>
             <property name="width-request">10</property>
             <property name="height-request">10</property>
+            <layout>
+              <property name="left_attach">0</property>
+              <property name="top_attach">3</property>
+              <property name="column-span">1</property>
+              <property name="row-span">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">0</property>
-            <property name="top_attach">3</property>
-            <property name="width">1</property>
-            <property name="height">1</property>
-          </packing>
         </child>
         <child>
           <object class="GtkPicture" id="picture-1-3">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="halign">center</property>
             <property name="valign">center</property>
             <property name="width-request">10</property>
             <property name="height-request">10</property>
+            <layout>
+              <property name="left_attach">1</property>
+              <property name="top_attach">3</property>
+              <property name="column-span">1</property>
+              <property name="row-span">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">1</property>
-            <property name="top_attach">3</property>
-            <property name="width">1</property>
-            <property name="height">1</property>
-          </packing>
         </child>
         <child>
           <object class="GtkPicture" id="picture-2-3">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="halign">center</property>
             <property name="valign">center</property>
             <property name="width-request">10</property>
             <property name="height-request">10</property>
+            <layout>
+              <property name="left_attach">2</property>
+              <property name="top_attach">3</property>
+              <property name="column-span">1</property>
+              <property name="row-span">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">2</property>
-            <property name="top_attach">3</property>
-            <property name="width">1</property>
-            <property name="height">1</property>
-          </packing>
         </child>
         <child>
           <object class="GtkPicture" id="picture-3-3">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="halign">center</property>
             <property name="valign">center</property>
             <property name="width-request">10</property>
             <property name="height-request">10</property>
+            <layout>
+              <property name="left_attach">3</property>
+              <property name="top_attach">3</property>
+              <property name="column-span">1</property>
+              <property name="row-span">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">3</property>
-            <property name="top_attach">3</property>
-            <property name="width">1</property>
-            <property name="height">1</property>
-          </packing>
         </child>
       </object>
     </child>

diff --git a/testsuite/reftests/iconview-empty.ui b/testsuite/reftests/iconview-empty.ui
index d86efb44cef443fd3b5a74afa6720e4e7e8edc88..a483b422727d7032f1ab518439fb2c5ea28e345d 100644 (file)
--- a/testsuite/reftests/iconview-empty.ui
+++ b/testsuite/reftests/iconview-empty.ui
@@ -1,57 +1,45 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
-  <!-- interface-requires gtk+ 3.0 -->
   <object class="GtkWindow" id="window">
-    <property name="can_focus">False</property>
     <property name="type">popup</property>
     <child>
       <object class="GtkGrid" id="grid">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
         <property name="row_spacing">5</property>
         <property name="column_spacing">5</property>
         <child>
           <object class="GtkIconView" id="iconview-0-0">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
-            <property name="columns">-1</property>
             <property name="column-spacing">0</property>
             <property name="halign">center</property>
             <property name="item-padding">0</property>
             <property name="margin">0</property>
             <property name="row-spacing">0</property>
             <property name="valign">center</property>
+            <layout>
+              <property name="left_attach">0</property>
+              <property name="top_attach">0</property>
+              <property name="column-span">1</property>
+              <property name="row-span">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">0</property>
-            <property name="top_attach">0</property>
-            <property name="width">1</property>
-            <property name="height">1</property>
-          </packing>
         </child>
         <child>
           <object class="GtkIconView" id="iconview-1-0">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
-            <property name="columns">-1</property>
             <property name="column-spacing">0</property>
             <property name="halign">center</property>
             <property name="item-padding">5</property>
             <property name="margin">0</property>
             <property name="row-spacing">0</property>
             <property name="valign">center</property>
+            <layout>
+              <property name="left_attach">1</property>
+              <property name="top_attach">0</property>
+              <property name="column-span">1</property>
+              <property name="row-span">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">1</property>
-            <property name="top_attach">0</property>
-            <property name="width">1</property>
-            <property name="height">1</property>
-          </packing>
         </child>
         <child>
           <object class="GtkIconView" id="iconview-2-0">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="columns">5</property>
             <property name="column-spacing">0</property>
             <property name="halign">center</property>
@@ -59,18 +47,16 @@
             <property name="margin">0</property>
             <property name="row-spacing">0</property>
             <property name="valign">center</property>
+            <layout>
+              <property name="left_attach">2</property>
+              <property name="top_attach">0</property>
+              <property name="column-span">1</property>
+              <property name="row-span">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">2</property>
-            <property name="top_attach">0</property>
-            <property name="width">1</property>
-            <property name="height">1</property>
-          </packing>
         </child>
         <child>
           <object class="GtkIconView" id="iconview-3-0">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="columns">5</property>
             <property name="column-spacing">0</property>
             <property name="halign">center</property>
@@ -78,56 +64,48 @@
             <property name="margin">0</property>
             <property name="row-spacing">0</property>
             <property name="valign">center</property>
+            <layout>
+              <property name="left_attach">3</property>
+              <property name="top_attach">0</property>
+              <property name="column-span">1</property>
+              <property name="row-span">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">3</property>
-            <property name="top_attach">0</property>
-            <property name="width">1</property>
-            <property name="height">1</property>
-          </packing>
         </child>
         <child>
           <object class="GtkIconView" id="iconview-0-1">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
-            <property name="columns">-1</property>
             <property name="column-spacing">5</property>
             <property name="halign">center</property>
             <property name="item-padding">0</property>
             <property name="margin">0</property>
             <property name="row-spacing">5</property>
             <property name="valign">center</property>
+            <layout>
+              <property name="left_attach">0</property>
+              <property name="top_attach">1</property>
+              <property name="column-span">1</property>
+              <property name="row-span">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">0</property>
-            <property name="top_attach">1</property>
-            <property name="width">1</property>
-            <property name="height">1</property>
-          </packing>
         </child>
         <child>
           <object class="GtkIconView" id="iconview-1-1">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
-            <property name="columns">-1</property>
             <property name="column-spacing">5</property>
             <property name="halign">center</property>
             <property name="item-padding">5</property>
             <property name="margin">0</property>
             <property name="row-spacing">5</property>
             <property name="valign">center</property>
+            <layout>
+              <property name="left_attach">1</property>
+              <property name="top_attach">1</property>
+              <property name="column-span">1</property>
+              <property name="row-span">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">1</property>
-            <property name="top_attach">1</property>
-            <property name="width">1</property>
-            <property name="height">1</property>
-          </packing>
         </child>
         <child>
           <object class="GtkIconView" id="iconview-2-1">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="columns">5</property>
             <property name="column-spacing">5</property>
             <property name="halign">center</property>
@@ -135,18 +113,16 @@
             <property name="margin">0</property>
             <property name="row-spacing">5</property>
             <property name="valign">center</property>
+            <layout>
+              <property name="left_attach">2</property>
+              <property name="top_attach">1</property>
+              <property name="column-span">1</property>
+              <property name="row-span">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">2</property>
-            <property name="top_attach">1</property>
-            <property name="width">1</property>
-            <property name="height">1</property>
-          </packing>
         </child>
         <child>
           <object class="GtkIconView" id="iconview-3-1">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="columns">5</property>
             <property name="column-spacing">5</property>
             <property name="halign">center</property>
@@ -154,56 +130,48 @@
             <property name="margin">0</property>
             <property name="row-spacing">5</property>
             <property name="valign">center</property>
+            <layout>
+              <property name="left_attach">3</property>
+              <property name="top_attach">1</property>
+              <property name="column-span">1</property>
+              <property name="row-span">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">3</property>
-            <property name="top_attach">1</property>
-            <property name="width">1</property>
-            <property name="height">1</property>
-          </packing>
         </child>
         <child>
           <object class="GtkIconView" id="iconview-0-2">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
-            <property name="columns">-1</property>
             <property name="column-spacing">0</property>
             <property name="halign">center</property>
             <property name="item-padding">0</property>
             <property name="margin">5</property>
             <property name="row-spacing">0</property>
             <property name="valign">center</property>
+            <layout>
+              <property name="left_attach">0</property>
+              <property name="top_attach">2</property>
+              <property name="column-span">1</property>
+              <property name="row-span">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">0</property>
-            <property name="top_attach">2</property>
-            <property name="width">1</property>
-            <property name="height">1</property>
-          </packing>
         </child>
         <child>
           <object class="GtkIconView" id="iconview-1-2">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
-            <property name="columns">-1</property>
             <property name="column-spacing">0</property>
             <property name="halign">center</property>
             <property name="item-padding">5</property>
             <property name="margin">5</property>
             <property name="row-spacing">0</property>
             <property name="valign">center</property>
+            <layout>
+              <property name="left_attach">1</property>
+              <property name="top_attach">2</property>
+              <property name="column-span">1</property>
+              <property name="row-span">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">1</property>
-            <property name="top_attach">2</property>
-            <property name="width">1</property>
-            <property name="height">1</property>
-          </packing>
         </child>
         <child>
           <object class="GtkIconView" id="iconview-2-2">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="columns">5</property>
             <property name="column-spacing">0</property>
             <property name="halign">center</property>
@@ -211,18 +179,16 @@
             <property name="margin">5</property>
             <property name="row-spacing">0</property>
             <property name="valign">center</property>
+            <layout>
+              <property name="left_attach">2</property>
+              <property name="top_attach">2</property>
+              <property name="column-span">1</property>
+              <property name="row-span">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">2</property>
-            <property name="top_attach">2</property>
-            <property name="width">1</property>
-            <property name="height">1</property>
-          </packing>
         </child>
         <child>
           <object class="GtkIconView" id="iconview-3-2">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="columns">5</property>
             <property name="column-spacing">0</property>
             <property name="halign">center</property>
@@ -230,56 +196,48 @@
             <property name="margin">5</property>
             <property name="row-spacing">0</property>
             <property name="valign">center</property>
+            <layout>
+              <property name="left_attach">3</property>
+              <property name="top_attach">2</property>
+              <property name="column-span">1</property>
+              <property name="row-span">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">3</property>
-            <property name="top_attach">2</property>
-            <property name="width">1</property>
-            <property name="height">1</property>
-          </packing>
         </child>
         <child>
           <object class="GtkIconView" id="iconview-0-3">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
-            <property name="columns">-1</property>
             <property name="column-spacing">5</property>
             <property name="halign">center</property>
             <property name="item-padding">0</property>
             <property name="margin">5</property>
             <property name="row-spacing">5</property>
             <property name="valign">center</property>
+            <layout>
+              <property name="left_attach">0</property>
+              <property name="top_attach">3</property>
+              <property name="column-span">1</property>
+              <property name="row-span">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">0</property>
-            <property name="top_attach">3</property>
-            <property name="width">1</property>
-            <property name="height">1</property>
-          </packing>
         </child>
         <child>
           <object class="GtkIconView" id="iconview-1-3">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
-            <property name="columns">-1</property>
             <property name="column-spacing">5</property>
             <property name="halign">center</property>
             <property name="item-padding">5</property>
             <property name="margin">5</property>
             <property name="row-spacing">5</property>
             <property name="valign">center</property>
+            <layout>
+              <property name="left_attach">1</property>
+              <property name="top_attach">3</property>
+              <property name="column-span">1</property>
+              <property name="row-span">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">1</property>
-            <property name="top_attach">3</property>
-            <property name="width">1</property>
-            <property name="height">1</property>
-          </packing>
         </child>
         <child>
           <object class="GtkIconView" id="iconview-2-3">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="columns">5</property>
             <property name="column-spacing">5</property>
             <property name="halign">center</property>
@@ -287,18 +245,16 @@
             <property name="margin">5</property>
             <property name="row-spacing">5</property>
             <property name="valign">center</property>
+            <layout>
+              <property name="left_attach">2</property>
+              <property name="top_attach">3</property>
+              <property name="column-span">1</property>
+              <property name="row-span">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">2</property>
-            <property name="top_attach">3</property>
-            <property name="width">1</property>
-            <property name="height">1</property>
-          </packing>
         </child>
         <child>
           <object class="GtkIconView" id="iconview-3-3">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="columns">5</property>
             <property name="column-spacing">5</property>
             <property name="halign">center</property>
@@ -306,13 +262,13 @@
             <property name="margin">5</property>
             <property name="row-spacing">5</property>
             <property name="valign">center</property>
+            <layout>
+              <property name="left_attach">3</property>
+              <property name="top_attach">3</property>
+              <property name="column-span">1</property>
+              <property name="row-span">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">3</property>
-            <property name="top_attach">3</property>
-            <property name="width">1</property>
-            <property name="height">1</property>
-          </packing>
         </child>
       </object>
     </child>

diff --git a/testsuite/reftests/image-icon-name-use-fallback.ref.ui b/testsuite/reftests/image-icon-name-use-fallback.ref.ui
index 398dc714ccb29c221a39c6f17189dec174ffd7bc..8ba61ab4bd44af2bd806cee26002abf3f78d1502 100644 (file)
--- a/testsuite/reftests/image-icon-name-use-fallback.ref.ui
+++ b/testsuite/reftests/image-icon-name-use-fallback.ref.ui
@@ -1,16 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!-- Generated with glade 3.19.0 -->
 <interface>
   <requires lib="gtk+" version="3.10"/>
   <object class="GtkWindow" id="window1">
-    <property name="can_focus">False</property>
     <property name="type">popup</property>
     <child>
       <object class="GtkImage" id="image1">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
         <property name="icon_name">edit-delete</property>
-        <property name="use_fallback">True</property>
+        <property name="use_fallback">1</property>
       </object>
     </child>
   </object>

diff --git a/testsuite/reftests/image-icon-name-use-fallback.ui b/testsuite/reftests/image-icon-name-use-fallback.ui
index 442664c5ecc2d1b68d183f82a8a29944dc5c0062..10fefbd02821d3a97eb525a3cb5a6c3dfbee0e5c 100644 (file)
--- a/testsuite/reftests/image-icon-name-use-fallback.ui
+++ b/testsuite/reftests/image-icon-name-use-fallback.ui
@@ -1,16 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!-- Generated with glade 3.19.0 -->
 <interface>
   <requires lib="gtk+" version="3.10"/>
   <object class="GtkWindow" id="window1">
-    <property name="can_focus">False</property>
     <property name="type">popup</property>
     <child>
       <object class="GtkImage" id="image1">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
         <property name="icon_name">edit-delete-lolwtfbbq</property>
-        <property name="use_fallback">True</property>
+        <property name="use_fallback">1</property>
       </object>
     </child>
   </object>

diff --git a/testsuite/reftests/image-icon-shadow-clipping.ref.ui b/testsuite/reftests/image-icon-shadow-clipping.ref.ui
index c67050823073b6bce8f1aff99fb5bd09fb7cd9f0..7573765213e24c943bc0c5f39a54a3fd9b7f53aa 100644 (file)
--- a/testsuite/reftests/image-icon-shadow-clipping.ref.ui
+++ b/testsuite/reftests/image-icon-shadow-clipping.ref.ui
@@ -1,16 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!-- Generated with glade 3.18.1 -->
 <interface>
   <requires lib="gtk+" version="3.12"/>
   <object class="GtkWindow" id="window1">
     <property name="width_request">100</property>
     <property name="height_request">100</property>
-    <property name="can_focus">False</property>
     <property name="type">popup</property>
     <child>
       <object class="GtkImage" id="image1">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
         <property name="icon_name">edit-delete</property>
       </object>
     </child>

diff --git a/testsuite/reftests/image-icon-shadow-clipping.ui b/testsuite/reftests/image-icon-shadow-clipping.ui
index 161b089d515b6df8daf732a2b1dfa6adbf0d3496..4f88c0f0eebe5775c99f470e04fad3d938c77f95 100644 (file)
--- a/testsuite/reftests/image-icon-shadow-clipping.ui
+++ b/testsuite/reftests/image-icon-shadow-clipping.ui
@@ -1,23 +1,17 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!-- Generated with glade 3.18.1 -->
 <interface>
   <requires lib="gtk+" version="3.12"/>
   <object class="GtkWindow" id="window1">
     <property name="width_request">100</property>
     <property name="height_request">100</property>
-    <property name="can_focus">False</property>
     <property name="type">popup</property>
     <child>
       <object class="GtkBox" id="box2">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
         <property name="halign">center</property>
         <property name="valign">center</property>
         <property name="orientation">vertical</property>
         <child>
           <object class="GtkImage" id="image1">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="icon_name">edit-delete</property>
           </object>
         </child>

diff --git a/testsuite/reftests/image-load-from-file.ref.ui b/testsuite/reftests/image-load-from-file.ref.ui
index ca9be604f7deee7d42f57232f8b30c8e005fab96..6ebe6b9f90f93dafdf6257b9a77ebc3901b99454 100644 (file)
--- a/testsuite/reftests/image-load-from-file.ref.ui
+++ b/testsuite/reftests/image-load-from-file.ref.ui
@@ -1,8 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
-  <!-- interface-requires gtk+ 3.0 -->
   <object class="GtkWindow" id="window1">
-    <property name="can_focus">False</property>
     <property name="type">popup</property>
     <child>
       <object class="GtkBox" id="box1">

diff --git a/testsuite/reftests/image-load-from-file.ui b/testsuite/reftests/image-load-from-file.ui
index 2ea571d7e6eeb5cd906e0119096826b22c037d7c..8e7a5446ce3acda72927f3a0a76d1a66b0cc74ee 100644 (file)
--- a/testsuite/reftests/image-load-from-file.ui
+++ b/testsuite/reftests/image-load-from-file.ui
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
-  <!-- interface-requires gtk+ 3.0 -->
   <object class="GtkWindow" id="window1">
     <property name="type">popup</property>
     <child>

diff --git a/testsuite/reftests/inherit-and-initial.ref.ui b/testsuite/reftests/inherit-and-initial.ref.ui
index e978c242c8591cc68a483fc812cf15105fc40ef5..bf193f0fb168c33204424c4cd15c02a9539b2160 100644 (file)
--- a/testsuite/reftests/inherit-and-initial.ref.ui
+++ b/testsuite/reftests/inherit-and-initial.ref.ui
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
 <interface>
   <object class="GtkAdjustment" id="adjustment1">
     <property name="upper">100</property>
@@ -312,55 +313,45 @@ Suspendisse feugiat quam quis dolor accumsan cursus. </property>
             </style>
             <child>
               <object class="GtkToolButton" id="toolbutton2">
+                <property name="homogeneous">1</property>
                 <property name="name">inherit</property>
                 <property name="label" translatable="yes">Save</property>
                 <property name="use_underline">1</property>
                 <property name="icon_name">document-save</property>
               </object>
-              <packing>
-                <property name="homogeneous">1</property>
-              </packing>
             </child>
             <child>
               <object class="GtkToolButton" id="toolbutton1">
+                <property name="homogeneous">1</property>
                 <property name="name">inherit</property>
                 <property name="label" translatable="yes">Open</property>
                 <property name="use_underline">1</property>
                 <property name="icon_name">document-open</property>
               </object>
-              <packing>
-                <property name="homogeneous">1</property>
-              </packing>
             </child>
             <child>
               <object class="GtkSeparatorToolItem" id="toolbutton3">
+                <property name="homogeneous">1</property>
                 <property name="name">inherit</property>
               </object>
-              <packing>
-                <property name="homogeneous">1</property>
-              </packing>
             </child>
             <child>
               <object class="GtkToolButton" id="toolbutton4">
+                <property name="homogeneous">1</property>
                 <property name="name">inherit</property>
                 <property name="label" translatable="yes">Find</property>
                 <property name="use_underline">1</property>
                 <property name="icon_name">edit-find</property>
               </object>
-              <packing>
-                <property name="homogeneous">1</property>
-              </packing>
             </child>
             <child>
               <object class="GtkToolItem" id="toolbutton5">
+                <property name="homogeneous">1</property>
                 <property name="name">inherit</property>
                 <child>
                   <placeholder/>
                 </child>
               </object>
-              <packing>
-                <property name="homogeneous">1</property>
-              </packing>
             </child>
             <child>
               <object class="GtkToolItem" id="toolbutton6">
@@ -469,22 +460,22 @@ Suspendisse feugiat quam quis dolor accumsan cursus. </property>
                         <property name="name">inherit</property>
                         <property name="can_focus">1</property>
                         <property name="active">1</property>
+                        <layout>
+                          <property name="left_attach">0</property>
+                          <property name="top_attach">0</property>
+                        </layout>
                       </object>
-                      <packing>
-                        <property name="left_attach">0</property>
-                        <property name="top_attach">0</property>
-                      </packing>
                     </child>
                     <child>
                       <object class="GtkCheckButton" id="checkbutton2">
                         <property name="label" translatable="yes">checkbutton</property>
                         <property name="name">inherit</property>
                         <property name="can_focus">1</property>
+                        <layout>
+                          <property name="left_attach">0</property>
+                          <property name="top_attach">1</property>
+                        </layout>
                       </object>
-                      <packing>
-                        <property name="left_attach">0</property>
-                        <property name="top_attach">1</property>
-                      </packing>
                     </child>
                     <child>
                       <object class="GtkCheckButton" id="checkbutton3">
@@ -492,11 +483,11 @@ Suspendisse feugiat quam quis dolor accumsan cursus. </property>
                         <property name="name">inherit</property>
                         <property name="inconsistent">1</property>
                         <property name="can_focus">1</property>
+                        <layout>
+                          <property name="left_attach">0</property>
+                          <property name="top_attach">2</property>
+                        </layout>
                       </object>
-                      <packing>
-                        <property name="left_attach">0</property>
-                        <property name="top_attach">2</property>
-                      </packing>
                     </child>
                     <child>
                       <object class="GtkCheckButton" id="checkbutton4">
@@ -505,11 +496,11 @@ Suspendisse feugiat quam quis dolor accumsan cursus. </property>
                         <property name="sensitive">0</property>
                         <property name="can_focus">1</property>
                         <property name="active">1</property>
+                        <layout>
+                          <property name="left_attach">0</property>
+                          <property name="top_attach">3</property>
+                        </layout>
                       </object>
-                      <packing>
-                        <property name="left_attach">0</property>
-                        <property name="top_attach">3</property>
-                      </packing>
                     </child>
                     <child>
                       <object class="GtkCheckButton" id="checkbutton5">
@@ -517,11 +508,11 @@ Suspendisse feugiat quam quis dolor accumsan cursus. </property>
                         <property name="name">inherit</property>
                         <property name="sensitive">0</property>
                         <property name="can_focus">1</property>
+                        <layout>
+                          <property name="left_attach">0</property>
+                          <property name="top_attach">4</property>
+                        </layout>
                       </object>
-                      <packing>
-                        <property name="left_attach">0</property>
-                        <property name="top_attach">4</property>
-                      </packing>
                     </child>
                     <child>
                       <object class="GtkCheckButton" id="checkbutton6">
@@ -530,11 +521,11 @@ Suspendisse feugiat quam quis dolor accumsan cursus. </property>
                         <property name="sensitive">0</property>
                         <property name="inconsistent">1</property>
                         <property name="can_focus">1</property>
+                        <layout>
+                          <property name="left_attach">0</property>
+                          <property name="top_attach">5</property>
+                        </layout>
                       </object>
-                      <packing>
-                        <property name="left_attach">0</property>
-                        <property name="top_attach">5</property>
-                      </packing>
                     </child>
                     <child>
                       <object class="GtkRadioButton" id="radiobutton1">
@@ -542,11 +533,11 @@ Suspendisse feugiat quam quis dolor accumsan cursus. </property>
                         <property name="name">inherit</property>
                         <property name="can_focus">1</property>
                         <property name="active">1</property>
+                        <layout>
+                          <property name="left_attach">1</property>
+                          <property name="top_attach">0</property>
+                        </layout>
                       </object>
-                      <packing>
-                        <property name="left_attach">1</property>
-                        <property name="top_attach">0</property>
-                      </packing>
                     </child>
                     <child>
                       <object class="GtkRadioButton" id="radiobutton2">
@@ -555,11 +546,11 @@ Suspendisse feugiat quam quis dolor accumsan cursus. </property>
                         <property name="can_focus">1</property>
                         <property name="active">1</property>
                         <property name="group">radiobutton1</property>
+                        <layout>
+                          <property name="left_attach">1</property>
+                          <property name="top_attach">1</property>
+                        </layout>
                       </object>
-                      <packing>
-                        <property name="left_attach">1</property>
-                        <property name="top_attach">1</property>
-                      </packing>
                     </child>
                     <child>
                       <object class="GtkRadioButton" id="radiobutton3">
@@ -569,11 +560,11 @@ Suspendisse feugiat quam quis dolor accumsan cursus. </property>
                         <property name="can_focus">1</property>
                         <property name="active">1</property>
                         <property name="group">radiobutton1</property>
+                        <layout>
+                          <property name="left_attach">1</property>
+                          <property name="top_attach">2</property>
+                        </layout>
                       </object>
-                      <packing>
-                        <property name="left_attach">1</property>
-                        <property name="top_attach">2</property>
-                      </packing>
                     </child>
                     <child>
                       <object class="GtkRadioButton" id="radiobutton4">
@@ -582,11 +573,11 @@ Suspendisse feugiat quam quis dolor accumsan cursus. </property>
                         <property name="sensitive">0</property>
                         <property name="can_focus">1</property>
                         <property name="active">1</property>
+                        <layout>
+                          <property name="left_attach">1</property>
+                          <property name="top_attach">3</property>
+                        </layout>
                       </object>
-                      <packing>
-                        <property name="left_attach">1</property>
-                        <property name="top_attach">3</property>
-                      </packing>
                     </child>
                     <child>
                       <object class="GtkRadioButton" id="radiobutton5">
@@ -596,11 +587,11 @@ Suspendisse feugiat quam quis dolor accumsan cursus. </property>
                         <property name="can_focus">1</property>
                         <property name="active">1</property>
                         <property name="group">radiobutton3</property>
+                        <layout>
+                          <property name="left_attach">1</property>
+                          <property name="top_attach">4</property>
+                        </layout>
                       </object>
-                      <packing>
-                        <property name="left_attach">1</property>
-                        <property name="top_attach">4</property>
-                      </packing>
                     </child>
                     <child>
                       <object class="GtkRadioButton" id="radiobutton6">
@@ -611,30 +602,30 @@ Suspendisse feugiat quam quis dolor accumsan cursus. </property>
                         <property name="can_focus">1</property>
                         <property name="active">1</property>
                         <property name="group">radiobutton3</property>
+                        <layout>
+                          <property name="left_attach">1</property>
+                          <property name="top_attach">5</property>
+                        </layout>
                       </object>
-                      <packing>
-                        <property name="left_attach">1</property>
-                        <property name="top_attach">5</property>
-                      </packing>
                     </child>
                     <child>
                       <object class="GtkSwitch" id="switch1">
                         <property name="name">inherit</property>
+                        <layout>
+                          <property name="left_attach">0</property>
+                          <property name="top_attach">6</property>
+                        </layout>
                       </object>
-                      <packing>
-                        <property name="left_attach">0</property>
-                        <property name="top_attach">6</property>
-                      </packing>
                     </child>
                     <child>
                       <object class="GtkSwitch" id="switch2">
                         <property name="name">inherit</property>
                         <property name="sensitive">0</property>
+                        <layout>
+                          <property name="left_attach">1</property>
+                          <property name="top_attach">6</property>
+                        </layout>
                       </object>
-                      <packing>
-                        <property name="left_attach">1</property>
-                        <property name="top_attach">6</property>
-                      </packing>
                     </child>
                   </object>
                 </child>

diff --git a/testsuite/reftests/inherit-and-initial.ui b/testsuite/reftests/inherit-and-initial.ui
index c08b2d8a11c2293bb464c1739dc6ed5a1da48655..9a587ea907b87174cbd71ad2fe7331bcaaf44233 100644 (file)
--- a/testsuite/reftests/inherit-and-initial.ui
+++ b/testsuite/reftests/inherit-and-initial.ui
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
 <interface>
   <object class="GtkAdjustment" id="adjustment1">
     <property name="upper">100</property>
@@ -272,49 +273,40 @@ Suspendisse feugiat quam quis dolor accumsan cursus. </property>
             </style>
             <child>
               <object class="GtkToolButton" id="toolbutton2">
+                <property name="homogeneous">1</property>
                 <property name="label" translatable="yes">Save</property>
                 <property name="use_underline">1</property>
                 <property name="icon_name">document-save</property>
               </object>
-              <packing>
-                <property name="homogeneous">1</property>
-              </packing>
             </child>
             <child>
               <object class="GtkToolButton" id="toolbutton1">
+                <property name="homogeneous">1</property>
                 <property name="label" translatable="yes">Open</property>
                 <property name="use_underline">1</property>
                 <property name="icon_name">document-open</property>
               </object>
-              <packing>
-                <property name="homogeneous">1</property>
-              </packing>
             </child>
             <child>
-              <object class="GtkSeparatorToolItem" id="toolbutton3"/>
-              <packing>
+              <object class="GtkSeparatorToolItem" id="toolbutton3">
                 <property name="homogeneous">1</property>
-              </packing>
+              </object>
             </child>
             <child>
               <object class="GtkToolButton" id="toolbutton4">
+                <property name="homogeneous">1</property>
                 <property name="label" translatable="yes">Find</property>
                 <property name="use_underline">1</property>
                 <property name="icon_name">edit-find</property>
               </object>
-              <packing>
-                <property name="homogeneous">1</property>
-              </packing>
             </child>
             <child>
               <object class="GtkToolItem" id="toolbutton5">
+                <property name="homogeneous">1</property>
                 <child>
                   <placeholder/>
                 </child>
               </object>
-              <packing>
-                <property name="homogeneous">1</property>
-              </packing>
             </child>
             <child>
               <object class="GtkToolItem" id="toolbutton6">
@@ -408,32 +400,32 @@ Suspendisse feugiat quam quis dolor accumsan cursus. </property>
                         <property name="label" translatable="yes">checkbutton</property>
                         <property name="can_focus">1</property>
                         <property name="active">1</property>
+                        <layout>
+                          <property name="left_attach">0</property>
+                          <property name="top_attach">0</property>
+                        </layout>
                       </object>
-                      <packing>
-                        <property name="left_attach">0</property>
-                        <property name="top_attach">0</property>
-                      </packing>
                     </child>
                     <child>
                       <object class="GtkCheckButton" id="checkbutton2">
                         <property name="label" translatable="yes">checkbutton</property>
                         <property name="can_focus">1</property>
+                        <layout>
+                          <property name="left_attach">0</property>
+                          <property name="top_attach">1</property>
+                        </layout>
                       </object>
-                      <packing>
-                        <property name="left_attach">0</property>
-                        <property name="top_attach">1</property>
-                      </packing>
                     </child>
                     <child>
                       <object class="GtkCheckButton" id="checkbutton3">
                         <property name="label" translatable="yes">checkbutton</property>
                         <property name="inconsistent">1</property>
                         <property name="can_focus">1</property>
+                        <layout>
+                          <property name="left_attach">0</property>
+                          <property name="top_attach">2</property>
+                        </layout>
                       </object>
-                      <packing>
-                        <property name="left_attach">0</property>
-                        <property name="top_attach">2</property>
-                      </packing>
                     </child>
                     <child>
                       <object class="GtkCheckButton" id="checkbutton4">
@@ -441,22 +433,22 @@ Suspendisse feugiat quam quis dolor accumsan cursus. </property>
                         <property name="sensitive">0</property>
                         <property name="can_focus">1</property>
                         <property name="active">1</property>
+                        <layout>
+                          <property name="left_attach">0</property>
+                          <property name="top_attach">3</property>
+                        </layout>
                       </object>
-                      <packing>
-                        <property name="left_attach">0</property>
-                        <property name="top_attach">3</property>
-                      </packing>
                     </child>
                     <child>
                       <object class="GtkCheckButton" id="checkbutton5">
                         <property name="label" translatable="yes">checkbutton</property>
                         <property name="sensitive">0</property>
                         <property name="can_focus">1</property>
+                        <layout>
+                          <property name="left_attach">0</property>
+                          <property name="top_attach">4</property>
+                        </layout>
                       </object>
-                      <packing>
-                        <property name="left_attach">0</property>
-                        <property name="top_attach">4</property>
-                      </packing>
                     </child>
                     <child>
                       <object class="GtkCheckButton" id="checkbutton6">
@@ -464,22 +456,22 @@ Suspendisse feugiat quam quis dolor accumsan cursus. </property>
                         <property name="sensitive">0</property>
                         <property name="inconsistent">1</property>
                         <property name="can_focus">1</property>
+                        <layout>
+                          <property name="left_attach">0</property>
+                          <property name="top_attach">5</property>
+                        </layout>
                       </object>
-                      <packing>
-                        <property name="left_attach">0</property>
-                        <property name="top_attach">5</property>
-                      </packing>
                     </child>
                     <child>
                       <object class="GtkRadioButton" id="radiobutton1">
                         <property name="label" translatable="yes">radiobutton</property>
                         <property name="can_focus">1</property>
                         <property name="active">1</property>
+                        <layout>
+                          <property name="left_attach">1</property>
+                          <property name="top_attach">0</property>
+                        </layout>
                       </object>
-                      <packing>
-                        <property name="left_attach">1</property>
-                        <property name="top_attach">0</property>
-                      </packing>
                     </child>
                     <child>
                       <object class="GtkRadioButton" id="radiobutton2">
@@ -487,11 +479,11 @@ Suspendisse feugiat quam quis dolor accumsan cursus. </property>
                         <property name="can_focus">1</property>
                         <property name="active">1</property>
                         <property name="group">radiobutton1</property>
+                        <layout>
+                          <property name="left_attach">1</property>
+                          <property name="top_attach">1</property>
+                        </layout>
                       </object>
-                      <packing>
-                        <property name="left_attach">1</property>
-                        <property name="top_attach">1</property>
-                      </packing>
                     </child>
                     <child>
                       <object class="GtkRadioButton" id="radiobutton3">
@@ -500,11 +492,11 @@ Suspendisse feugiat quam quis dolor accumsan cursus. </property>
                         <property name="can_focus">1</property>
                         <property name="active">1</property>
                         <property name="group">radiobutton1</property>
+                        <layout>
+                          <property name="left_attach">1</property>
+                          <property name="top_attach">2</property>
+                        </layout>
                       </object>
-                      <packing>
-                        <property name="left_attach">1</property>
-                        <property name="top_attach">2</property>
-                      </packing>
                     </child>
                     <child>
                       <object class="GtkRadioButton" id="radiobutton4">
@@ -512,11 +504,11 @@ Suspendisse feugiat quam quis dolor accumsan cursus. </property>
                         <property name="sensitive">0</property>
                         <property name="can_focus">1</property>
                         <property name="active">1</property>
+                        <layout>
+                          <property name="left_attach">1</property>
+                          <property name="top_attach">3</property>
+                        </layout>
                       </object>
-                      <packing>
-                        <property name="left_attach">1</property>
-                        <property name="top_attach">3</property>
-                      </packing>
                     </child>
                     <child>
                       <object class="GtkRadioButton" id="radiobutton5">
@@ -525,11 +517,11 @@ Suspendisse feugiat quam quis dolor accumsan cursus. </property>
                         <property name="can_focus">1</property>
                         <property name="active">1</property>
                         <property name="group">radiobutton3</property>
+                        <layout>
+                          <property name="left_attach">1</property>
+                          <property name="top_attach">4</property>
+                        </layout>
                       </object>
-                      <packing>
-                        <property name="left_attach">1</property>
-                        <property name="top_attach">4</property>
-                      </packing>
                     </child>
                     <child>
                       <object class="GtkRadioButton" id="radiobutton6">
@@ -539,27 +531,28 @@ Suspendisse feugiat quam quis dolor accumsan cursus. </property>
                         <property name="can_focus">1</property>
                         <property name="active">1</property>
                         <property name="group">radiobutton3</property>
+                        <layout>
+                          <property name="left_attach">1</property>
+                          <property name="top_attach">5</property>
+                        </layout>
                       </object>
-                      <packing>
-                        <property name="left_attach">1</property>
-                        <property name="top_attach">5</property>
-                      </packing>
                     </child>
                     <child>
-                      <object class="GtkSwitch" id="switch1"/>
-                      <packing>
-                        <property name="left_attach">0</property>
-                        <property name="top_attach">6</property>
-                      </packing>
+                      <object class="GtkSwitch" id="switch1">
+                        <layout>
+                          <property name="left_attach">0</property>
+                          <property name="top_attach">6</property>
+                        </layout>
+                      </object>
                     </child>
                     <child>
                       <object class="GtkSwitch" id="switch2">
                         <property name="sensitive">0</property>
+                        <layout>
+                          <property name="left_attach">1</property>
+                          <property name="top_attach">6</property>
+                        </layout>
                       </object>
-                      <packing>
-                        <property name="left_attach">1</property>
-                        <property name="top_attach">6</property>
-                      </packing>
                     </child>
                   </object>
                 </child>

diff --git a/testsuite/reftests/label-attribute-preference.ref.ui b/testsuite/reftests/label-attribute-preference.ref.ui
index 77f9b28709b912d4e16125ae788daece621fc855..2d459233002bfba68005c1573104686cce94a4da 100644 (file)
--- a/testsuite/reftests/label-attribute-preference.ref.ui
+++ b/testsuite/reftests/label-attribute-preference.ref.ui
@@ -1,22 +1,18 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
-  <!-- interface-requires gtk+ 3.0 -->
   <object class="GtkWindow" id="window1">
-    <property name="can_focus">False</property>
     <property name="type">popup</property>
     <child>
       <object class="GtkLabel" id="label1">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
         <property name="label" translatable="yes">Hello linky World</property>
         <attributes>
-          <attribute name="foreground" value="#000080000000" start="1" end="3"/>
-          <attribute name="foreground" value="#ffff00000000" start="3" end="8"/>
-          <attribute name="foreground" value="#0000ffff0000" start="8" end="9"/>
-          <attribute name="foreground" value="#00000000ffff" start="9" end="10"/>
-          <attribute name="foreground" value="#ffff80008000" start="10" end="14"/>
-          <attribute name="foreground" value="#8000ffff8000" start="14" end="16"/>
-          <attribute name="underline" value="True" start="6" end="11"/>
+          <attribute name="foreground" value="#000080000000" start="1" end="3"></attribute>
+          <attribute name="foreground" value="#ffff00000000" start="3" end="8"></attribute>
+          <attribute name="foreground" value="#0000ffff0000" start="8" end="9"></attribute>
+          <attribute name="foreground" value="#00000000ffff" start="9" end="10"></attribute>
+          <attribute name="foreground" value="#ffff80008000" start="10" end="14"></attribute>
+          <attribute name="foreground" value="#8000ffff8000" start="14" end="16"></attribute>
+          <attribute name="underline" value="True" start="6" end="11"></attribute>
         </attributes>
       </object>
     </child>

diff --git a/testsuite/reftests/label-attribute-preference.ui b/testsuite/reftests/label-attribute-preference.ui
index fb268216cc89893c5446f1fcec9c52c8bb035d5e..ae9fbfe0462bbc65a307debd70cfa50011fc6f79 100644 (file)
--- a/testsuite/reftests/label-attribute-preference.ui
+++ b/testsuite/reftests/label-attribute-preference.ui
@@ -1,18 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
-  <!-- interface-requires gtk+ 3.0 -->
   <object class="GtkWindow" id="window1">
-    <property name="can_focus">False</property>
     <property name="type">popup</property>
     <child>
       <object class="GtkLabel" id="label1">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
-        <property name="use-markup">True</property>
-        <property name="label" translatable="yes">H&lt;span color="#008000"&gt;ell&lt;/span&gt;o &lt;a href="http://example.com"&gt;l&lt;span color="#00FF00"&gt;in&lt;/span&gt;ky&lt;/a&gt; &lt;span color="#80FF80"&gt;Worl&lt;/span&gt;d</property>
+        <property name="use-markup">1</property>
+        <property name="label" translatable="yes">H&lt;span color=&quot;#008000&quot;&gt;ell&lt;/span&gt;o &lt;a href=&quot;http://example.com&quot;&gt;l&lt;span color=&quot;#00FF00&quot;&gt;in&lt;/span&gt;ky&lt;/a&gt; &lt;span color=&quot;#80FF80&quot;&gt;Worl&lt;/span&gt;d</property>
         <attributes>
-          <attribute name="foreground" value="#ffff00000000" start="3" end="8"/>
-          <attribute name="foreground" value="#ffff80008000" start="10" end="14"/>
+          <attribute name="foreground" value="#ffff00000000" start="3" end="8"></attribute>
+          <attribute name="foreground" value="#ffff80008000" start="10" end="14"></attribute>
         </attributes>
       </object>
     </child>

diff --git a/testsuite/reftests/label-background.ref.ui b/testsuite/reftests/label-background.ref.ui
index 50522287ea30f1397120c84f593d14d91b41f433..1bda217d61c571856ba0e8626471b9559e78391e 100644 (file)
--- a/testsuite/reftests/label-background.ref.ui
+++ b/testsuite/reftests/label-background.ref.ui
@@ -1,14 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!-- Generated with glade 3.18.1 -->
 <interface>
   <requires lib="gtk+" version="3.12"/>
   <object class="GtkWindow" id="window1">
-    <property name="can_focus">False</property>
     <property name="type">popup</property>
     <child>
       <object class="GtkLabel" id="label1">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
         <property name="label" translatable="yes">Hello World!</property>
       </object>
     </child>

diff --git a/testsuite/reftests/label-background.ui b/testsuite/reftests/label-background.ui
index b79f28e837697e4093260caaa6c92d661eea256a..3f7117ee319aab34925df49400e96f7ab23ed35c 100644 (file)
--- a/testsuite/reftests/label-background.ui
+++ b/testsuite/reftests/label-background.ui
@@ -1,25 +1,17 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!-- Generated with glade 3.18.1 -->
 <interface>
   <requires lib="gtk+" version="3.12"/>
   <object class="GtkWindow" id="window1">
-    <property name="can_focus">False</property>
     <property name="type">popup</property>
     <child>
       <object class="GtkBox" id="box1">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
         <child>
           <object class="GtkLabel" id="label1">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="label" translatable="yes">Hello </property>
           </object>
         </child>
         <child>
           <object class="GtkLabel" id="label2">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="label" translatable="yes">World!</property>
           </object>
         </child>

diff --git a/testsuite/reftests/label-box-shadow-clip.ref.ui b/testsuite/reftests/label-box-shadow-clip.ref.ui
index 31f744d3a93c5ce3c4d419810101901061ac2220..97be53210ba4c0a5f68e12c34268893a25218baf 100644 (file)
--- a/testsuite/reftests/label-box-shadow-clip.ref.ui
+++ b/testsuite/reftests/label-box-shadow-clip.ref.ui
@@ -1,16 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!-- Generated with glade 3.18.1 -->
 <interface>
   <requires lib="gtk+" version="3.12"/>
   <object class="GtkWindow" id="window1">
     <property name="width_request">100</property>
     <property name="height_request">100</property>
-    <property name="can_focus">False</property>
     <property name="type">popup</property>
     <child>
       <object class="GtkLabel" id="label1">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
         <property name="halign">center</property>
         <property name="valign">center</property>
         <property name="label" translatable="yes">X</property>

diff --git a/testsuite/reftests/label-box-shadow-clip.ui b/testsuite/reftests/label-box-shadow-clip.ui
index 03741621b7a3c6c1a217aa1e61c0215ab63ea606..7672f7db14d9ac8cf08ca9c67f5b67f825b76780 100644 (file)
--- a/testsuite/reftests/label-box-shadow-clip.ui
+++ b/testsuite/reftests/label-box-shadow-clip.ui
@@ -1,16 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!-- Generated with glade 3.18.1 -->
 <interface>
   <requires lib="gtk+" version="3.12"/>
   <object class="GtkWindow" id="window1">
     <property name="width_request">100</property>
     <property name="height_request">100</property>
-    <property name="can_focus">False</property>
     <property name="type">popup</property>
     <child>
       <object class="GtkLabel" id="label1">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
         <property name="halign">center</property>
         <property name="valign">center</property>
         <property name="label" translatable="yes">X</property>

diff --git a/testsuite/reftests/label-clipping.ref.ui b/testsuite/reftests/label-clipping.ref.ui
index 13eba47fc09aae46448d5b577a67ca564275d307..905cf05636095baa11fbe3fa621036e7c8112aa0 100644 (file)
--- a/testsuite/reftests/label-clipping.ref.ui
+++ b/testsuite/reftests/label-clipping.ref.ui
@@ -1,15 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!-- Generated with glade 3.18.1 -->
 <interface>
   <requires lib="gtk+" version="3.12"/>
   <object class="GtkWindow" id="window1">
     <property name="width_request">500</property>
-    <property name="can_focus">False</property>
     <property name="type">popup</property>
     <child>
       <object class="GtkLabel" id="label1">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
         <property name="label" translatable="yes">fffffffff</property>
       </object>
     </child>

diff --git a/testsuite/reftests/label-clipping.ui b/testsuite/reftests/label-clipping.ui
index 56d5ad06d2617f6b4ae1f1f621bfe57c541d5968..058d66b280059ca7fbed406ce2ebf767bd075516 100644 (file)
--- a/testsuite/reftests/label-clipping.ui
+++ b/testsuite/reftests/label-clipping.ui
@@ -1,22 +1,16 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!-- Generated with glade 3.18.1 -->
 <interface>
   <requires lib="gtk+" version="3.12"/>
   <object class="GtkWindow" id="window1">
     <property name="width_request">500</property>
-    <property name="can_focus">False</property>
     <property name="type">popup</property>
     <child>
       <object class="GtkBox" id="box2">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
         <property name="halign">center</property>
         <property name="valign">center</property>
         <property name="orientation">vertical</property>
         <child>
           <object class="GtkLabel" id="label1">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="label" translatable="yes">fffffffff</property>
           </object>
         </child>

diff --git a/testsuite/reftests/label-ellipsize-small.ref.ui b/testsuite/reftests/label-ellipsize-small.ref.ui
index dd7bb852c5443205c41c515ef2c63ac6dfca7527..20c9277b9d4b93f51606865526f0d65305203ce6 100644 (file)
--- a/testsuite/reftests/label-ellipsize-small.ref.ui
+++ b/testsuite/reftests/label-ellipsize-small.ref.ui
@@ -1,13 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
-  <!-- interface-requires gtk+ 3.0 -->
   <object class="GtkWindow" id="window1">
-    <property name="can_focus">False</property>
     <property name="type">popup</property>
     <child>
       <object class="GtkLabel" id="label1">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
         <property name="label" translatable="yes">d</property>
       </object>
     </child>

diff --git a/testsuite/reftests/label-ellipsize-small.ui b/testsuite/reftests/label-ellipsize-small.ui
index c2d4fd0ed7c9b00332f5977c271eaa0831828220..7b7ca388949bb09151f7d316c8de9f70914b85e8 100644 (file)
--- a/testsuite/reftests/label-ellipsize-small.ui
+++ b/testsuite/reftests/label-ellipsize-small.ui
@@ -1,13 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
-  <!-- interface-requires gtk+ 3.0 -->
   <object class="GtkWindow" id="window1">
-    <property name="can_focus">False</property>
     <property name="type">popup</property>
     <child>
       <object class="GtkLabel" id="label1">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
         <property name="label" translatable="yes">d</property>
         <property name="ellipsize">end</property>
       </object>

diff --git a/testsuite/reftests/label-ellipsize-with-big.ref.ui b/testsuite/reftests/label-ellipsize-with-big.ref.ui
index 59e21f5020fb32281e1f13872528a054a8e7bb3f..18dff6e51a274c0d98184a3c56e765f2093c00cf 100644 (file)
--- a/testsuite/reftests/label-ellipsize-with-big.ref.ui
+++ b/testsuite/reftests/label-ellipsize-with-big.ref.ui
@@ -1,15 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
-  <!-- interface-requires gtk+ 3.0 -->
   <object class="GtkWindow" id="window1">
-    <property name="can_focus">False</property>
     <property name="type">popup</property>
     <child>
       <object class="GtkLabel" id="label1">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
-        <property name="label" translatable="yes"> &lt;big&gt;&lt;b&gt;There's a space in front&lt;/b&gt;&lt;/big&gt;</property>
-        <property name="use_markup">True</property>
+        <property name="label" translatable="yes"> &lt;big&gt;&lt;b&gt;There&apos;s a space in front&lt;/b&gt;&lt;/big&gt;</property>
+        <property name="use_markup">1</property>
         <property name="ellipsize">end</property>
       </object>
     </child>

diff --git a/testsuite/reftests/label-ellipsize-with-big.ui b/testsuite/reftests/label-ellipsize-with-big.ui
index 59e21f5020fb32281e1f13872528a054a8e7bb3f..18dff6e51a274c0d98184a3c56e765f2093c00cf 100644 (file)
--- a/testsuite/reftests/label-ellipsize-with-big.ui
+++ b/testsuite/reftests/label-ellipsize-with-big.ui
@@ -1,15 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
-  <!-- interface-requires gtk+ 3.0 -->
   <object class="GtkWindow" id="window1">
-    <property name="can_focus">False</property>
     <property name="type">popup</property>
     <child>
       <object class="GtkLabel" id="label1">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
-        <property name="label" translatable="yes"> &lt;big&gt;&lt;b&gt;There's a space in front&lt;/b&gt;&lt;/big&gt;</property>
-        <property name="use_markup">True</property>
+        <property name="label" translatable="yes"> &lt;big&gt;&lt;b&gt;There&apos;s a space in front&lt;/b&gt;&lt;/big&gt;</property>
+        <property name="use_markup">1</property>
         <property name="ellipsize">end</property>
       </object>
     </child>

diff --git a/testsuite/reftests/label-shadows.ref.ui b/testsuite/reftests/label-shadows.ref.ui
index d94ec4d791108c2c2c8a8599277557f0465720b1..6523efea03d2621324bda12a55feea442a95b734 100644 (file)
--- a/testsuite/reftests/label-shadows.ref.ui
+++ b/testsuite/reftests/label-shadows.ref.ui
@@ -1,168 +1,140 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
-  <!-- interface-requires gtk+ 3.0 -->
   <object class="GtkWindow" id="window1">
-    <property name="can_focus">False</property>
     <property name="type">popup</property>
     <child>
       <object class="GtkGrid" id="grid1">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
         <child>
           <object class="GtkFixed" id="fixed1">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <child>
               <object class="GtkLabel" id="shadow1">
-                <property name="visible">True</property>
-                <property name="can_focus">False</property>
                 <property name="label" translatable="yes">ABC</property>
                 <attributes>
-                  <attribute name="foreground" value="#ffff00000000"/>
+                  <attribute name="foreground" value="#ffff00000000"></attribute>
                 </attributes>
                 <style>
-                  <class name="no-shadow" />
+                  <class name="no-shadow"/>
                 </style>
+                <layout>
+                  <property name="x">2</property>
+                  <property name="y">2</property>
+                </layout>
               </object>
-              <packing>
-                <property name="x">2</property>
-                <property name="y">2</property>
-              </packing>
             </child>
             <child>
               <object class="GtkLabel" id="label1">
-                <property name="visible">True</property>
-                <property name="can_focus">False</property>
                 <property name="label" translatable="yes">ABC</property>
                 <style>
-                  <class name="no-shadow" />
+                  <class name="no-shadow"/>
                 </style>
               </object>
             </child>
+            <layout>
+              <property name="left_attach">0</property>
+              <property name="top_attach">0</property>
+              <property name="column-span">1</property>
+              <property name="row-span">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">0</property>
-            <property name="top_attach">0</property>
-            <property name="width">1</property>
-            <property name="height">1</property>
-          </packing>
         </child>
         <child>
           <object class="GtkFixed" id="fixed2">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <child>
               <object class="GtkLabel" id="shadow2">
-                <property name="visible">True</property>
-                <property name="can_focus">False</property>
                 <property name="label" translatable="yes">ABC</property>
                 <attributes>
-                  <attribute name="foreground" value="#ffff00000000"/>
+                  <attribute name="foreground" value="#ffff00000000"></attribute>
                 </attributes>
                 <style>
-                  <class name="no-shadow" />
+                  <class name="no-shadow"/>
                 </style>
+                <layout>
+                  <property name="x">2</property>
+                  <property name="y">0</property>
+                </layout>
               </object>
-              <packing>
-                <property name="x">2</property>
-                <property name="y">0</property>
-              </packing>
             </child>
             <child>
               <object class="GtkLabel" id="label2">
-                <property name="visible">True</property>
-                <property name="can_focus">False</property>
                 <property name="label" translatable="yes">ABC</property>
                 <style>
-                  <class name="no-shadow" />
+                  <class name="no-shadow"/>
                 </style>
               </object>
             </child>
+            <layout>
+              <property name="left_attach">1</property>
+              <property name="top_attach">0</property>
+              <property name="column-span">1</property>
+              <property name="row-span">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">1</property>
-            <property name="top_attach">0</property>
-            <property name="width">1</property>
-            <property name="height">1</property>
-          </packing>
         </child>
         <child>
           <object class="GtkFixed" id="fixed3">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <child>
               <object class="GtkLabel" id="shadow3">
-                <property name="visible">True</property>
-                <property name="can_focus">False</property>
                 <property name="label" translatable="yes">ABC</property>
                 <attributes>
-                  <attribute name="foreground" value="#ffff00000000"/>
+                  <attribute name="foreground" value="#ffff00000000"></attribute>
                 </attributes>
                 <style>
-                  <class name="no-shadow" />
+                  <class name="no-shadow"/>
                 </style>
+                <layout>
+                  <property name="x">0</property>
+                  <property name="y">0</property>
+                </layout>
               </object>
-              <packing>
-                <property name="x">0</property>
-                <property name="y">0</property>
-              </packing>
             </child>
             <child>
               <object class="GtkLabel" id="label3">
-                <property name="visible">True</property>
-                <property name="can_focus">False</property>
                 <property name="label" translatable="yes">ABC</property>
                 <style>
-                  <class name="no-shadow" />
+                  <class name="no-shadow"/>
                 </style>
               </object>
             </child>
+            <layout>
+              <property name="left_attach">1</property>
+              <property name="top_attach">1</property>
+              <property name="column-span">1</property>
+              <property name="row-span">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">1</property>
-            <property name="top_attach">1</property>
-            <property name="width">1</property>
-            <property name="height">1</property>
-          </packing>
         </child>
         <child>
           <object class="GtkFixed" id="fixed4">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <child>
               <object class="GtkLabel" id="shadow4">
-                <property name="visible">True</property>
-                <property name="can_focus">False</property>
                 <property name="label" translatable="yes">ABC</property>
                 <attributes>
-                  <attribute name="foreground" value="#ffff00000000"/>
+                  <attribute name="foreground" value="#ffff00000000"></attribute>
                 </attributes>
                 <style>
-                  <class name="no-shadow" />
+                  <class name="no-shadow"/>
                 </style>
+                <layout>
+                  <property name="x">0</property>
+                  <property name="y">2</property>
+                </layout>
               </object>
-              <packing>
-                <property name="x">0</property>
-                <property name="y">2</property>
-              </packing>
             </child>
             <child>
               <object class="GtkLabel" id="label4">
-                <property name="visible">True</property>
-                <property name="can_focus">False</property>
                 <property name="label" translatable="yes">ABC</property>
                 <style>
-                  <class name="no-shadow" />
+                  <class name="no-shadow"/>
                 </style>
               </object>
             </child>
+            <layout>
+              <property name="left_attach">0</property>
+              <property name="top_attach">1</property>
+              <property name="column-span">1</property>
+              <property name="row-span">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">0</property>
-            <property name="top_attach">1</property>
-            <property name="width">1</property>
-            <property name="height">1</property>
-          </packing>
         </child>
       </object>
     </child>

diff --git a/testsuite/reftests/label-shadows.ui b/testsuite/reftests/label-shadows.ui
index 06176081846523deb7456575d9c2fcd1c6071d45..d3093d6dca4641fdde27e232b3f74ca550873692 100644 (file)
--- a/testsuite/reftests/label-shadows.ui
+++ b/testsuite/reftests/label-shadows.ui
@@ -1,72 +1,60 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
-  <!-- interface-requires gtk+ 3.0 -->
   <object class="GtkWindow" id="window1">
-    <property name="can_focus">False</property>
     <property name="type">popup</property>
     <child>
       <object class="GtkGrid" id="grid1">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
         <child>
           <object class="GtkLabel" id="label1">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="halign">start</property>
             <property name="valign">start</property>
             <property name="label" translatable="yes">ABC</property>
+            <layout>
+              <property name="left_attach">0</property>
+              <property name="top_attach">0</property>
+              <property name="column-span">1</property>
+              <property name="row-span">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">0</property>
-            <property name="top_attach">0</property>
-            <property name="width">1</property>
-            <property name="height">1</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="label2">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="halign">start</property>
             <property name="valign">start</property>
             <property name="label" translatable="yes">ABC</property>
+            <layout>
+              <property name="left_attach">1</property>
+              <property name="top_attach">0</property>
+              <property name="column-span">1</property>
+              <property name="row-span">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">1</property>
-            <property name="top_attach">0</property>
-            <property name="width">1</property>
-            <property name="height">1</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="label3">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="halign">start</property>
             <property name="valign">start</property>
             <property name="label" translatable="yes">ABC</property>
+            <layout>
+              <property name="left_attach">1</property>
+              <property name="top_attach">1</property>
+              <property name="column-span">1</property>
+              <property name="row-span">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">1</property>
-            <property name="top_attach">1</property>
-            <property name="width">1</property>
-            <property name="height">1</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="label4">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="halign">start</property>
             <property name="valign">start</property>
             <property name="label" translatable="yes">ABC</property>
+            <layout>
+              <property name="left_attach">0</property>
+              <property name="top_attach">1</property>
+              <property name="column-span">1</property>
+              <property name="row-span">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">0</property>
-            <property name="top_attach">1</property>
-            <property name="width">1</property>
-            <property name="height">1</property>
-          </packing>
         </child>
         <child>
           <placeholder/>

diff --git a/testsuite/reftests/label-sizing.ref.ui b/testsuite/reftests/label-sizing.ref.ui
index 6e4b0f4c06e32453aba82f0356aa733313d4dcee..d1ac565dc87851d0be05d8f46cc8378fbf0edd6b 100644 (file)
--- a/testsuite/reftests/label-sizing.ref.ui
+++ b/testsuite/reftests/label-sizing.ref.ui
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
 <interface>
   <object class="GtkWindow" id="window1">
     <property name="type">popup</property>
@@ -10,97 +11,95 @@
         <child>
           <object class="GtkLabel" id="label2">
             <property name="label" translatable="yes">wrap</property>
+            <layout>
+              <property name="left_attach">0</property>
+              <property name="top_attach">0</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">0</property>
-            <property name="top_attach">0</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="label3">
             <property name="label" translatable="yes">ellipsize</property>
+            <layout>
+              <property name="left_attach">1</property>
+              <property name="top_attach">0</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">1</property>
-            <property name="top_attach">0</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="label4">
             <property name="label" translatable="yes">width-chars</property>
+            <layout>
+              <property name="left_attach">2</property>
+              <property name="top_attach">0</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">2</property>
-            <property name="top_attach">0</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="label5">
             <property name="label" translatable="yes">max-width-chars</property>
+            <layout>
+              <property name="left_attach">3</property>
+              <property name="top_attach">0</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">3</property>
-            <property name="top_attach">0</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="label6">
             <property name="label" translatable="yes">results</property>
+            <layout>
+              <property name="left_attach">4</property>
+              <property name="top_attach">0</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">4</property>
-            <property name="top_attach">0</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="wrap1">
             <property name="label" translatable="yes">False</property>
+            <layout>
+              <property name="left_attach">0</property>
+              <property name="top_attach">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">0</property>
-            <property name="top_attach">1</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="ellipsize1">
             <property name="label" translatable="yes">none</property>
+            <layout>
+              <property name="left_attach">1</property>
+              <property name="top_attach">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">1</property>
-            <property name="top_attach">1</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="width_chars1">
             <property name="label" translatable="yes">-1</property>
+            <layout>
+              <property name="left_attach">2</property>
+              <property name="top_attach">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">2</property>
-            <property name="top_attach">1</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="max_width_chars1">
             <property name="label" translatable="yes">-1</property>
+            <layout>
+              <property name="left_attach">3</property>
+              <property name="top_attach">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">3</property>
-            <property name="top_attach">1</property>
-          </packing>
         </child>
         <child>
           <object class="GtkPaned" id="paned1">
-            <property name="shrink-child2">False</property>
-            <property name="resize-child2">True</property>
-            <property name="shrink-child1">False</property>
-            <property name="resize-child1">False</property>
+            <property name="shrink-child2">0</property>
+            <property name="shrink-child1">0</property>
+            <property name="resize-child1">0</property>
             <property name="can_focus">1</property>
             <child>
               <object class="GtkPaned" id="required1">
-                <property name="shrink-child2">False</property>
-                <property name="resize-child2">True</property>
-                <property name="shrink-child1">False</property>
-                <property name="resize-child1">False</property>
+                <property name="shrink-child2">0</property>
+                <property name="shrink-child1">0</property>
+                <property name="resize-child1">0</property>
                 <property name="can_focus">1</property>
                 <property name="orientation">vertical</property>
                 <child>
@@ -129,10 +128,9 @@
             </child>
             <child>
               <object class="GtkPaned" id="natural1">
-                <property name="shrink-child2">False</property>
-                <property name="resize-child2">True</property>
-                <property name="shrink-child1">False</property>
-                <property name="resize-child1">False</property>
+                <property name="shrink-child2">0</property>
+                <property name="shrink-child1">0</property>
+                <property name="resize-child1">0</property>
                 <property name="can_focus">1</property>
                 <property name="orientation">vertical</property>
                 <child>
@@ -159,61 +157,59 @@
                 </child>
               </object>
             </child>
+            <layout>
+              <property name="left_attach">4</property>
+              <property name="top_attach">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">4</property>
-            <property name="top_attach">1</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="wrap2">
             <property name="label" translatable="yes">True</property>
+            <layout>
+              <property name="left_attach">0</property>
+              <property name="top_attach">2</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">0</property>
-            <property name="top_attach">2</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="ellipsize2">
             <property name="label" translatable="yes">none</property>
+            <layout>
+              <property name="left_attach">1</property>
+              <property name="top_attach">2</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">1</property>
-            <property name="top_attach">2</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="width_chars2">
             <property name="label" translatable="yes">-1</property>
+            <layout>
+              <property name="left_attach">2</property>
+              <property name="top_attach">2</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">2</property>
-            <property name="top_attach">2</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="max_width_chars2">
             <property name="label" translatable="yes">-1</property>
+            <layout>
+              <property name="left_attach">3</property>
+              <property name="top_attach">2</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">3</property>
-            <property name="top_attach">2</property>
-          </packing>
         </child>
         <child>
           <object class="GtkPaned" id="paned2">
-            <property name="shrink-child2">False</property>
-            <property name="resize-child2">True</property>
-            <property name="shrink-child1">False</property>
-            <property name="resize-child1">False</property>
+            <property name="shrink-child2">0</property>
+            <property name="shrink-child1">0</property>
+            <property name="resize-child1">0</property>
             <property name="can_focus">1</property>
             <child>
               <object class="GtkPaned" id="required2">
-                <property name="shrink-child2">False</property>
-                <property name="resize-child2">True</property>
-                <property name="shrink-child1">False</property>
-                <property name="resize-child1">False</property>
+                <property name="shrink-child2">0</property>
+                <property name="shrink-child1">0</property>
+                <property name="resize-child1">0</property>
                 <property name="can_focus">1</property>
                 <property name="orientation">vertical</property>
                 <child>
@@ -244,10 +240,9 @@ ABCD</property>
             </child>
             <child>
               <object class="GtkPaned" id="natural2">
-                <property name="shrink-child2">False</property>
-                <property name="resize-child2">True</property>
-                <property name="shrink-child1">False</property>
-                <property name="resize-child1">False</property>
+                <property name="shrink-child2">0</property>
+                <property name="shrink-child1">0</property>
+                <property name="resize-child1">0</property>
                 <property name="can_focus">1</property>
                 <property name="orientation">vertical</property>
                 <child>
@@ -274,61 +269,59 @@ ABCD</property>
                 </child>
               </object>
             </child>
+            <layout>
+              <property name="left_attach">4</property>
+              <property name="top_attach">2</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">4</property>
-            <property name="top_attach">2</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="wrap3">
             <property name="label" translatable="yes">False</property>
+            <layout>
+              <property name="left_attach">0</property>
+              <property name="top_attach">3</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">0</property>
-            <property name="top_attach">3</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="ellipsize3">
             <property name="label" translatable="yes">end</property>
+            <layout>
+              <property name="left_attach">1</property>
+              <property name="top_attach">3</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">1</property>
-            <property name="top_attach">3</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="width_chars3">
             <property name="label" translatable="yes">-1</property>
+            <layout>
+              <property name="left_attach">2</property>
+              <property name="top_attach">3</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">2</property>
-            <property name="top_attach">3</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="max_width_chars3">
             <property name="label" translatable="yes">-1</property>
+            <layout>
+              <property name="left_attach">3</property>
+              <property name="top_attach">3</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">3</property>
-            <property name="top_attach">3</property>
-          </packing>
         </child>
         <child>
           <object class="GtkPaned" id="paned3">
-            <property name="shrink-child2">False</property>
-            <property name="resize-child2">True</property>
-            <property name="shrink-child1">False</property>
-            <property name="resize-child1">False</property>
+            <property name="shrink-child2">0</property>
+            <property name="shrink-child1">0</property>
+            <property name="resize-child1">0</property>
             <property name="can_focus">1</property>
             <child>
               <object class="GtkPaned" id="required3">
-                <property name="shrink-child2">False</property>
-                <property name="resize-child2">True</property>
-                <property name="shrink-child1">False</property>
-                <property name="resize-child1">False</property>
+                <property name="shrink-child2">0</property>
+                <property name="shrink-child1">0</property>
+                <property name="resize-child1">0</property>
                 <property name="can_focus">1</property>
                 <property name="orientation">vertical</property>
                 <child>
@@ -357,10 +350,9 @@ ABCD</property>
             </child>
             <child>
               <object class="GtkPaned" id="natural3">
-                <property name="shrink-child2">False</property>
-                <property name="resize-child2">True</property>
-                <property name="shrink-child1">False</property>
-                <property name="resize-child1">False</property>
+                <property name="shrink-child2">0</property>
+                <property name="shrink-child1">0</property>
+                <property name="resize-child1">0</property>
                 <property name="can_focus">1</property>
                 <property name="orientation">vertical</property>
                 <child>
@@ -387,61 +379,59 @@ ABCD</property>
                 </child>
               </object>
             </child>
+            <layout>
+              <property name="left_attach">4</property>
+              <property name="top_attach">3</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">4</property>
-            <property name="top_attach">3</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="wrap4">
             <property name="label" translatable="yes">True</property>
+            <layout>
+              <property name="left_attach">0</property>
+              <property name="top_attach">4</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">0</property>
-            <property name="top_attach">4</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="ellipsize4">
             <property name="label" translatable="yes">end</property>
+            <layout>
+              <property name="left_attach">1</property>
+              <property name="top_attach">4</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">1</property>
-            <property name="top_attach">4</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="width_chars4">
             <property name="label" translatable="yes">-1</property>
+            <layout>
+              <property name="left_attach">2</property>
+              <property name="top_attach">4</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">2</property>
-            <property name="top_attach">4</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="max_width_chars4">
             <property name="label" translatable="yes">-1</property>
+            <layout>
+              <property name="left_attach">3</property>
+              <property name="top_attach">4</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">3</property>
-            <property name="top_attach">4</property>
-          </packing>
         </child>
         <child>
           <object class="GtkPaned" id="paned4">
-            <property name="shrink-child2">False</property>
-            <property name="resize-child2">True</property>
-            <property name="shrink-child1">False</property>
-            <property name="resize-child1">False</property>
+            <property name="shrink-child2">0</property>
+            <property name="shrink-child1">0</property>
+            <property name="resize-child1">0</property>
             <property name="can_focus">1</property>
             <child>
               <object class="GtkPaned" id="required4">
-                <property name="shrink-child2">False</property>
-                <property name="resize-child2">True</property>
-                <property name="shrink-child1">False</property>
-                <property name="resize-child1">False</property>
+                <property name="shrink-child2">0</property>
+                <property name="shrink-child1">0</property>
+                <property name="resize-child1">0</property>
                 <property name="can_focus">1</property>
                 <property name="orientation">vertical</property>
                 <child>
@@ -470,10 +460,9 @@ ABCD</property>
             </child>
             <child>
               <object class="GtkPaned" id="natural4">
-                <property name="shrink-child2">False</property>
-                <property name="resize-child2">True</property>
-                <property name="shrink-child1">False</property>
-                <property name="resize-child1">False</property>
+                <property name="shrink-child2">0</property>
+                <property name="shrink-child1">0</property>
+                <property name="resize-child1">0</property>
                 <property name="can_focus">1</property>
                 <property name="orientation">vertical</property>
                 <child>
@@ -500,61 +489,59 @@ ABCD</property>
                 </child>
               </object>
             </child>
+            <layout>
+              <property name="left_attach">4</property>
+              <property name="top_attach">4</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">4</property>
-            <property name="top_attach">4</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="wrap5">
             <property name="label" translatable="yes">False</property>
+            <layout>
+              <property name="left_attach">0</property>
+              <property name="top_attach">5</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">0</property>
-            <property name="top_attach">5</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="ellipsize5">
             <property name="label" translatable="yes">none</property>
+            <layout>
+              <property name="left_attach">1</property>
+              <property name="top_attach">5</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">1</property>
-            <property name="top_attach">5</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="width_chars5">
             <property name="label" translatable="yes">4</property>
+            <layout>
+              <property name="left_attach">2</property>
+              <property name="top_attach">5</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">2</property>
-            <property name="top_attach">5</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="max_width_chars5">
             <property name="label" translatable="yes">-1</property>
+            <layout>
+              <property name="left_attach">3</property>
+              <property name="top_attach">5</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">3</property>
-            <property name="top_attach">5</property>
-          </packing>
         </child>
         <child>
           <object class="GtkPaned" id="paned5">
-            <property name="shrink-child2">False</property>
-            <property name="resize-child2">True</property>
-            <property name="shrink-child1">False</property>
-            <property name="resize-child1">False</property>
+            <property name="shrink-child2">0</property>
+            <property name="shrink-child1">0</property>
+            <property name="resize-child1">0</property>
             <property name="can_focus">1</property>
             <child>
               <object class="GtkPaned" id="required5">
-                <property name="shrink-child2">False</property>
-                <property name="resize-child2">True</property>
-                <property name="shrink-child1">False</property>
-                <property name="resize-child1">False</property>
+                <property name="shrink-child2">0</property>
+                <property name="shrink-child1">0</property>
+                <property name="resize-child1">0</property>
                 <property name="can_focus">1</property>
                 <property name="orientation">vertical</property>
                 <child>
@@ -585,10 +572,9 @@ ABCD</property>
             </child>
             <child>
               <object class="GtkPaned" id="natural5">
-                <property name="shrink-child2">False</property>
-                <property name="resize-child2">True</property>
-                <property name="shrink-child1">False</property>
-                <property name="resize-child1">False</property>
+                <property name="shrink-child2">0</property>
+                <property name="shrink-child1">0</property>
+                <property name="resize-child1">0</property>
                 <property name="can_focus">1</property>
                 <property name="orientation">vertical</property>
                 <child>
@@ -617,61 +603,59 @@ ABCD</property>
                 </child>
               </object>
             </child>
+            <layout>
+              <property name="left_attach">4</property>
+              <property name="top_attach">5</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">4</property>
-            <property name="top_attach">5</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="wrap6">
             <property name="label" translatable="yes">True</property>
+            <layout>
+              <property name="left_attach">0</property>
+              <property name="top_attach">6</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">0</property>
-            <property name="top_attach">6</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="ellipsize6">
             <property name="label" translatable="yes">none</property>
+            <layout>
+              <property name="left_attach">1</property>
+              <property name="top_attach">6</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">1</property>
-            <property name="top_attach">6</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="width_chars6">
             <property name="label" translatable="yes">4</property>
+            <layout>
+              <property name="left_attach">2</property>
+              <property name="top_attach">6</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">2</property>
-            <property name="top_attach">6</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="max_width_chars6">
             <property name="label" translatable="yes">-1</property>
+            <layout>
+              <property name="left_attach">3</property>
+              <property name="top_attach">6</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">3</property>
-            <property name="top_attach">6</property>
-          </packing>
         </child>
         <child>
           <object class="GtkPaned" id="paned6">
-            <property name="shrink-child2">False</property>
-            <property name="resize-child2">True</property>
-            <property name="shrink-child1">False</property>
-            <property name="resize-child1">False</property>
+            <property name="shrink-child2">0</property>
+            <property name="shrink-child1">0</property>
+            <property name="resize-child1">0</property>
             <property name="can_focus">1</property>
             <child>
               <object class="GtkPaned" id="required6">
-                <property name="shrink-child2">False</property>
-                <property name="resize-child2">True</property>
-                <property name="shrink-child1">False</property>
-                <property name="resize-child1">False</property>
+                <property name="shrink-child2">0</property>
+                <property name="shrink-child1">0</property>
+                <property name="resize-child1">0</property>
                 <property name="can_focus">1</property>
                 <property name="orientation">vertical</property>
                 <child>
@@ -704,10 +688,9 @@ ABCD</property>
             </child>
             <child>
               <object class="GtkPaned" id="natural6">
-                <property name="shrink-child2">False</property>
-                <property name="resize-child2">True</property>
-                <property name="shrink-child1">False</property>
-                <property name="resize-child1">False</property>
+                <property name="shrink-child2">0</property>
+                <property name="shrink-child1">0</property>
+                <property name="resize-child1">0</property>
                 <property name="can_focus">1</property>
                 <property name="orientation">vertical</property>
                 <child>
@@ -736,61 +719,59 @@ ABCD</property>
                 </child>
               </object>
             </child>
+            <layout>
+              <property name="left_attach">4</property>
+              <property name="top_attach">6</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">4</property>
-            <property name="top_attach">6</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="wrap7">
             <property name="label" translatable="yes">False</property>
+            <layout>
+              <property name="left_attach">0</property>
+              <property name="top_attach">7</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">0</property>
-            <property name="top_attach">7</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="ellipsize7">
             <property name="label" translatable="yes">end</property>
+            <layout>
+              <property name="left_attach">1</property>
+              <property name="top_attach">7</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">1</property>
-            <property name="top_attach">7</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="width_chars7">
             <property name="label" translatable="yes">4</property>
+            <layout>
+              <property name="left_attach">2</property>
+              <property name="top_attach">7</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">2</property>
-            <property name="top_attach">7</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="max_width_chars7">
             <property name="label" translatable="yes">-1</property>
+            <layout>
+              <property name="left_attach">3</property>
+              <property name="top_attach">7</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">3</property>
-            <property name="top_attach">7</property>
-          </packing>
         </child>
         <child>
           <object class="GtkPaned" id="paned7">
-            <property name="shrink-child2">False</property>
-            <property name="resize-child2">True</property>
-            <property name="shrink-child1">False</property>
-            <property name="resize-child1">False</property>
+            <property name="shrink-child2">0</property>
+            <property name="shrink-child1">0</property>
+            <property name="resize-child1">0</property>
             <property name="can_focus">1</property>
             <child>
               <object class="GtkPaned" id="required7">
-                <property name="shrink-child2">False</property>
-                <property name="resize-child2">True</property>
-                <property name="shrink-child1">False</property>
-                <property name="resize-child1">False</property>
+                <property name="shrink-child2">0</property>
+                <property name="shrink-child1">0</property>
+                <property name="resize-child1">0</property>
                 <property name="can_focus">1</property>
                 <property name="orientation">vertical</property>
                 <child>
@@ -821,10 +802,9 @@ ABCD</property>
             </child>
             <child>
               <object class="GtkPaned" id="natural7">
-                <property name="shrink-child2">False</property>
-                <property name="resize-child2">True</property>
-                <property name="shrink-child1">False</property>
-                <property name="resize-child1">False</property>
+                <property name="shrink-child2">0</property>
+                <property name="shrink-child1">0</property>
+                <property name="resize-child1">0</property>
                 <property name="can_focus">1</property>
                 <property name="orientation">vertical</property>
                 <child>
@@ -853,61 +833,59 @@ ABCD</property>
                 </child>
               </object>
             </child>
+            <layout>
+              <property name="left_attach">4</property>
+              <property name="top_attach">7</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">4</property>
-            <property name="top_attach">7</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="wrap8">
             <property name="label" translatable="yes">True</property>
+            <layout>
+              <property name="left_attach">0</property>
+              <property name="top_attach">8</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">0</property>
-            <property name="top_attach">8</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="ellipsize8">
             <property name="label" translatable="yes">end</property>
+            <layout>
+              <property name="left_attach">1</property>
+              <property name="top_attach">8</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">1</property>
-            <property name="top_attach">8</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="width_chars8">
             <property name="label" translatable="yes">4</property>
+            <layout>
+              <property name="left_attach">2</property>
+              <property name="top_attach">8</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">2</property>
-            <property name="top_attach">8</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="max_width_chars8">
             <property name="label" translatable="yes">-1</property>
+            <layout>
+              <property name="left_attach">3</property>
+              <property name="top_attach">8</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">3</property>
-            <property name="top_attach">8</property>
-          </packing>
         </child>
         <child>
           <object class="GtkPaned" id="paned8">
-            <property name="shrink-child2">False</property>
-            <property name="resize-child2">True</property>
-            <property name="shrink-child1">False</property>
-            <property name="resize-child1">False</property>
+            <property name="shrink-child2">0</property>
+            <property name="shrink-child1">0</property>
+            <property name="resize-child1">0</property>
             <property name="can_focus">1</property>
             <child>
               <object class="GtkPaned" id="required8">
-                <property name="shrink-child2">False</property>
-                <property name="resize-child2">True</property>
-                <property name="shrink-child1">False</property>
-                <property name="resize-child1">False</property>
+                <property name="shrink-child2">0</property>
+                <property name="shrink-child1">0</property>
+                <property name="resize-child1">0</property>
                 <property name="can_focus">1</property>
                 <property name="orientation">vertical</property>
                 <child>
@@ -938,10 +916,9 @@ ABCD</property>
             </child>
             <child>
               <object class="GtkPaned" id="natural8">
-                <property name="shrink-child2">False</property>
-                <property name="resize-child2">True</property>
-                <property name="shrink-child1">False</property>
-                <property name="resize-child1">False</property>
+                <property name="shrink-child2">0</property>
+                <property name="shrink-child1">0</property>
+                <property name="resize-child1">0</property>
                 <property name="can_focus">1</property>
                 <property name="orientation">vertical</property>
                 <child>
@@ -970,61 +947,59 @@ ABCD</property>
                 </child>
               </object>
             </child>
+            <layout>
+              <property name="left_attach">4</property>
+              <property name="top_attach">8</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">4</property>
-            <property name="top_attach">8</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="wrap9">
             <property name="label" translatable="yes">False</property>
+            <layout>
+              <property name="left_attach">0</property>
+              <property name="top_attach">9</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">0</property>
-            <property name="top_attach">9</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="ellipsize9">
             <property name="label" translatable="yes">none</property>
+            <layout>
+              <property name="left_attach">1</property>
+              <property name="top_attach">9</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">1</property>
-            <property name="top_attach">9</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="width_chars9">
             <property name="label" translatable="yes">8</property>
+            <layout>
+              <property name="left_attach">2</property>
+              <property name="top_attach">9</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">2</property>
-            <property name="top_attach">9</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="max_width_chars9">
             <property name="label" translatable="yes">-1</property>
+            <layout>
+              <property name="left_attach">3</property>
+              <property name="top_attach">9</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">3</property>
-            <property name="top_attach">9</property>
-          </packing>
         </child>
         <child>
           <object class="GtkPaned" id="paned9">
-            <property name="shrink-child2">False</property>
-            <property name="resize-child2">True</property>
-            <property name="shrink-child1">False</property>
-            <property name="resize-child1">False</property>
+            <property name="shrink-child2">0</property>
+            <property name="shrink-child1">0</property>
+            <property name="resize-child1">0</property>
             <property name="can_focus">1</property>
             <child>
               <object class="GtkPaned" id="required9">
-                <property name="shrink-child2">False</property>
-                <property name="resize-child2">True</property>
-                <property name="shrink-child1">False</property>
-                <property name="resize-child1">False</property>
+                <property name="shrink-child2">0</property>
+                <property name="shrink-child1">0</property>
+                <property name="resize-child1">0</property>
                 <property name="can_focus">1</property>
                 <property name="orientation">vertical</property>
                 <child>
@@ -1055,10 +1030,9 @@ ABCD</property>
             </child>
             <child>
               <object class="GtkPaned" id="natural9">
-                <property name="shrink-child2">False</property>
-                <property name="resize-child2">True</property>
-                <property name="shrink-child1">False</property>
-                <property name="resize-child1">False</property>
+                <property name="shrink-child2">0</property>
+                <property name="shrink-child1">0</property>
+                <property name="resize-child1">0</property>
                 <property name="can_focus">1</property>
                 <property name="orientation">vertical</property>
                 <child>
@@ -1087,61 +1061,59 @@ ABCD</property>
                 </child>
               </object>
             </child>
+            <layout>
+              <property name="left_attach">4</property>
+              <property name="top_attach">9</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">4</property>
-            <property name="top_attach">9</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="wrap10">
             <property name="label" translatable="yes">True</property>
+            <layout>
+              <property name="left_attach">0</property>
+              <property name="top_attach">10</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">0</property>
-            <property name="top_attach">10</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="ellipsize10">
             <property name="label" translatable="yes">none</property>
+            <layout>
+              <property name="left_attach">1</property>
+              <property name="top_attach">10</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">1</property>
-            <property name="top_attach">10</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="width_chars10">
             <property name="label" translatable="yes">8</property>
+            <layout>
+              <property name="left_attach">2</property>
+              <property name="top_attach">10</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">2</property>
-            <property name="top_attach">10</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="max_width_chars10">
             <property name="label" translatable="yes">-1</property>
+            <layout>
+              <property name="left_attach">3</property>
+              <property name="top_attach">10</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">3</property>
-            <property name="top_attach">10</property>
-          </packing>
         </child>
         <child>
           <object class="GtkPaned" id="paned10">
-            <property name="shrink-child2">False</property>
-            <property name="resize-child2">True</property>
-            <property name="shrink-child1">False</property>
-            <property name="resize-child1">False</property>
+            <property name="shrink-child2">0</property>
+            <property name="shrink-child1">0</property>
+            <property name="resize-child1">0</property>
             <property name="can_focus">1</property>
             <child>
               <object class="GtkPaned" id="required10">
-                <property name="shrink-child2">False</property>
-                <property name="resize-child2">True</property>
-                <property name="shrink-child1">False</property>
-                <property name="resize-child1">False</property>
+                <property name="shrink-child2">0</property>
+                <property name="shrink-child1">0</property>
+                <property name="resize-child1">0</property>
                 <property name="can_focus">1</property>
                 <property name="orientation">vertical</property>
                 <child>
@@ -1174,10 +1146,9 @@ ABCD</property>
             </child>
             <child>
               <object class="GtkPaned" id="natural10">
-                <property name="shrink-child2">False</property>
-                <property name="resize-child2">True</property>
-                <property name="shrink-child1">False</property>
-                <property name="resize-child1">False</property>
+                <property name="shrink-child2">0</property>
+                <property name="shrink-child1">0</property>
+                <property name="resize-child1">0</property>
                 <property name="can_focus">1</property>
                 <property name="orientation">vertical</property>
                 <child>
@@ -1206,61 +1177,59 @@ ABCD</property>
                 </child>
               </object>
             </child>
+            <layout>
+              <property name="left_attach">4</property>
+              <property name="top_attach">10</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">4</property>
-            <property name="top_attach">10</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="wrap11">
             <property name="label" translatable="yes">False</property>
+            <layout>
+              <property name="left_attach">0</property>
+              <property name="top_attach">11</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">0</property>
-            <property name="top_attach">11</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="ellipsize11">
             <property name="label" translatable="yes">end</property>
+            <layout>
+              <property name="left_attach">1</property>
+              <property name="top_attach">11</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">1</property>
-            <property name="top_attach">11</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="width_chars11">
             <property name="label" translatable="yes">8</property>
+            <layout>
+              <property name="left_attach">2</property>
+              <property name="top_attach">11</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">2</property>
-            <property name="top_attach">11</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="max_width_chars11">
             <property name="label" translatable="yes">-1</property>
+            <layout>
+              <property name="left_attach">3</property>
+              <property name="top_attach">11</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">3</property>
-            <property name="top_attach">11</property>
-          </packing>
         </child>
         <child>
           <object class="GtkPaned" id="paned11">
-            <property name="shrink-child2">False</property>
-            <property name="resize-child2">True</property>
-            <property name="shrink-child1">False</property>
-            <property name="resize-child1">False</property>
+            <property name="shrink-child2">0</property>
+            <property name="shrink-child1">0</property>
+            <property name="resize-child1">0</property>
             <property name="can_focus">1</property>
             <child>
               <object class="GtkPaned" id="required11">
-                <property name="shrink-child2">False</property>
-                <property name="resize-child2">True</property>
-                <property name="shrink-child1">False</property>
-                <property name="resize-child1">False</property>
+                <property name="shrink-child2">0</property>
+                <property name="shrink-child1">0</property>
+                <property name="resize-child1">0</property>
                 <property name="can_focus">1</property>
                 <property name="orientation">vertical</property>
                 <child>
@@ -1291,10 +1260,9 @@ ABCD</property>
             </child>
             <child>
               <object class="GtkPaned" id="natural11">
-                <property name="shrink-child2">False</property>
-                <property name="resize-child2">True</property>
-                <property name="shrink-child1">False</property>
-                <property name="resize-child1">False</property>
+                <property name="shrink-child2">0</property>
+                <property name="shrink-child1">0</property>
+                <property name="resize-child1">0</property>
                 <property name="can_focus">1</property>
                 <property name="orientation">vertical</property>
                 <child>
@@ -1323,61 +1291,59 @@ ABCD</property>
                 </child>
               </object>
             </child>
+            <layout>
+              <property name="left_attach">4</property>
+              <property name="top_attach">11</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">4</property>
-            <property name="top_attach">11</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="wrap12">
             <property name="label" translatable="yes">True</property>
+            <layout>
+              <property name="left_attach">0</property>
+              <property name="top_attach">12</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">0</property>
-            <property name="top_attach">12</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="ellipsize12">
             <property name="label" translatable="yes">end</property>
+            <layout>
+              <property name="left_attach">1</property>
+              <property name="top_attach">12</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">1</property>
-            <property name="top_attach">12</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="width_chars12">
             <property name="label" translatable="yes">8</property>
+            <layout>
+              <property name="left_attach">2</property>
+              <property name="top_attach">12</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">2</property>
-            <property name="top_attach">12</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="max_width_chars12">
             <property name="label" translatable="yes">-1</property>
+            <layout>
+              <property name="left_attach">3</property>
+              <property name="top_attach">12</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">3</property>
-            <property name="top_attach">12</property>
-          </packing>
         </child>
         <child>
           <object class="GtkPaned" id="paned12">
-            <property name="shrink-child2">False</property>
-            <property name="resize-child2">True</property>
-            <property name="shrink-child1">False</property>
-            <property name="resize-child1">False</property>
+            <property name="shrink-child2">0</property>
+            <property name="shrink-child1">0</property>
+            <property name="resize-child1">0</property>
             <property name="can_focus">1</property>
             <child>
               <object class="GtkPaned" id="required12">
-                <property name="shrink-child2">False</property>
-                <property name="resize-child2">True</property>
-                <property name="shrink-child1">False</property>
-                <property name="resize-child1">False</property>
+                <property name="shrink-child2">0</property>
+                <property name="shrink-child1">0</property>
+                <property name="resize-child1">0</property>
                 <property name="can_focus">1</property>
                 <property name="orientation">vertical</property>
                 <child>
@@ -1408,10 +1374,9 @@ ABCD</property>
             </child>
             <child>
               <object class="GtkPaned" id="natural12">
-                <property name="shrink-child2">False</property>
-                <property name="resize-child2">True</property>
-                <property name="shrink-child1">False</property>
-                <property name="resize-child1">False</property>
+                <property name="shrink-child2">0</property>
+                <property name="shrink-child1">0</property>
+                <property name="resize-child1">0</property>
                 <property name="can_focus">1</property>
                 <property name="orientation">vertical</property>
                 <child>
@@ -1440,61 +1405,59 @@ ABCD</property>
                 </child>
               </object>
             </child>
+            <layout>
+              <property name="left_attach">4</property>
+              <property name="top_attach">12</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">4</property>
-            <property name="top_attach">12</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="wrap13">
             <property name="label" translatable="yes">False</property>
+            <layout>
+              <property name="left_attach">0</property>
+              <property name="top_attach">13</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">0</property>
-            <property name="top_attach">13</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="ellipsize13">
             <property name="label" translatable="yes">none</property>
+            <layout>
+              <property name="left_attach">1</property>
+              <property name="top_attach">13</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">1</property>
-            <property name="top_attach">13</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="width_chars13">
             <property name="label" translatable="yes">12</property>
+            <layout>
+              <property name="left_attach">2</property>
+              <property name="top_attach">13</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">2</property>
-            <property name="top_attach">13</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="max_width_chars13">
             <property name="label" translatable="yes">-1</property>
+            <layout>
+              <property name="left_attach">3</property>
+              <property name="top_attach">13</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">3</property>
-            <property name="top_attach">13</property>
-          </packing>
         </child>
         <child>
           <object class="GtkPaned" id="paned13">
-            <property name="shrink-child2">False</property>
-            <property name="resize-child2">True</property>
-            <property name="shrink-child1">False</property>
-            <property name="resize-child1">False</property>
+            <property name="shrink-child2">0</property>
+            <property name="shrink-child1">0</property>
+            <property name="resize-child1">0</property>
             <property name="can_focus">1</property>
             <child>
               <object class="GtkPaned" id="required13">
-                <property name="shrink-child2">False</property>
-                <property name="resize-child2">True</property>
-                <property name="shrink-child1">False</property>
-                <property name="resize-child1">False</property>
+                <property name="shrink-child2">0</property>
+                <property name="shrink-child1">0</property>
+                <property name="resize-child1">0</property>
                 <property name="can_focus">1</property>
                 <property name="orientation">vertical</property>
                 <child>
@@ -1525,10 +1488,9 @@ ABCD</property>
             </child>
             <child>
               <object class="GtkPaned" id="natural13">
-                <property name="shrink-child2">False</property>
-                <property name="resize-child2">True</property>
-                <property name="shrink-child1">False</property>
-                <property name="resize-child1">False</property>
+                <property name="shrink-child2">0</property>
+                <property name="shrink-child1">0</property>
+                <property name="resize-child1">0</property>
                 <property name="can_focus">1</property>
                 <property name="orientation">vertical</property>
                 <child>
@@ -1557,61 +1519,59 @@ ABCD</property>
                 </child>
               </object>
             </child>
+            <layout>
+              <property name="left_attach">4</property>
+              <property name="top_attach">13</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">4</property>
-            <property name="top_attach">13</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="wrap14">
             <property name="label" translatable="yes">True</property>
+            <layout>
+              <property name="left_attach">0</property>
+              <property name="top_attach">14</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">0</property>
-            <property name="top_attach">14</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="ellipsize14">
             <property name="label" translatable="yes">none</property>
+            <layout>
+              <property name="left_attach">1</property>
+              <property name="top_attach">14</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">1</property>
-            <property name="top_attach">14</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="width_chars14">
             <property name="label" translatable="yes">12</property>
+            <layout>
+              <property name="left_attach">2</property>
+              <property name="top_attach">14</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">2</property>
-            <property name="top_attach">14</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="max_width_chars14">
             <property name="label" translatable="yes">-1</property>
+            <layout>
+              <property name="left_attach">3</property>
+              <property name="top_attach">14</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">3</property>
-            <property name="top_attach">14</property>
-          </packing>
         </child>
         <child>
           <object class="GtkPaned" id="paned14">
-            <property name="shrink-child2">False</property>
-            <property name="resize-child2">True</property>
-            <property name="shrink-child1">False</property>
-            <property name="resize-child1">False</property>
+            <property name="shrink-child2">0</property>
+            <property name="shrink-child1">0</property>
+            <property name="resize-child1">0</property>
             <property name="can_focus">1</property>
             <child>
               <object class="GtkPaned" id="required14">
-                <property name="shrink-child2">False</property>
-                <property name="resize-child2">True</property>
-                <property name="shrink-child1">False</property>
-                <property name="resize-child1">False</property>
+                <property name="shrink-child2">0</property>
+                <property name="shrink-child1">0</property>
+                <property name="resize-child1">0</property>
                 <property name="can_focus">1</property>
                 <property name="orientation">vertical</property>
                 <child>
@@ -1642,10 +1602,9 @@ ABCD</property>
             </child>
             <child>
               <object class="GtkPaned" id="natural14">
-                <property name="shrink-child2">False</property>
-                <property name="resize-child2">True</property>
-                <property name="shrink-child1">False</property>
-                <property name="resize-child1">False</property>
+                <property name="shrink-child2">0</property>
+                <property name="shrink-child1">0</property>
+                <property name="resize-child1">0</property>
                 <property name="can_focus">1</property>
                 <property name="orientation">vertical</property>
                 <child>
@@ -1674,61 +1633,59 @@ ABCD</property>
                 </child>
               </object>
             </child>
+            <layout>
+              <property name="left_attach">4</property>
+              <property name="top_attach">14</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">4</property>
-            <property name="top_attach">14</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="wrap15">
             <property name="label" translatable="yes">False</property>
+            <layout>
+              <property name="left_attach">0</property>
+              <property name="top_attach">15</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">0</property>
-            <property name="top_attach">15</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="ellipsize15">
             <property name="label" translatable="yes">end</property>
+            <layout>
+              <property name="left_attach">1</property>
+              <property name="top_attach">15</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">1</property>
-            <property name="top_attach">15</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="width_chars15">
             <property name="label" translatable="yes">12</property>
+            <layout>
+              <property name="left_attach">2</property>
+              <property name="top_attach">15</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">2</property>
-            <property name="top_attach">15</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="max_width_chars15">
             <property name="label" translatable="yes">-1</property>
+            <layout>
+              <property name="left_attach">3</property>
+              <property name="top_attach">15</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">3</property>
-            <property name="top_attach">15</property>
-          </packing>
         </child>
         <child>
           <object class="GtkPaned" id="paned15">
-            <property name="shrink-child2">False</property>
-            <property name="resize-child2">True</property>
-            <property name="shrink-child1">False</property>
-            <property name="resize-child1">False</property>
+            <property name="shrink-child2">0</property>
+            <property name="shrink-child1">0</property>
+            <property name="resize-child1">0</property>
             <property name="can_focus">1</property>
             <child>
               <object class="GtkPaned" id="required15">
-                <property name="shrink-child2">False</property>
-                <property name="resize-child2">True</property>
-                <property name="shrink-child1">False</property>
-                <property name="resize-child1">False</property>
+                <property name="shrink-child2">0</property>
+                <property name="shrink-child1">0</property>
+                <property name="resize-child1">0</property>
                 <property name="can_focus">1</property>
                 <property name="orientation">vertical</property>
                 <child>
@@ -1759,10 +1716,9 @@ ABCD</property>
             </child>
             <child>
               <object class="GtkPaned" id="natural15">
-                <property name="shrink-child2">False</property>
-                <property name="resize-child2">True</property>
-                <property name="shrink-child1">False</property>
-                <property name="resize-child1">False</property>
+                <property name="shrink-child2">0</property>
+                <property name="shrink-child1">0</property>
+                <property name="resize-child1">0</property>
                 <property name="can_focus">1</property>
                 <property name="orientation">vertical</property>
                 <child>
@@ -1791,61 +1747,59 @@ ABCD</property>
                 </child>
               </object>
             </child>
+            <layout>
+              <property name="left_attach">4</property>
+              <property name="top_attach">15</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">4</property>
-            <property name="top_attach">15</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="wrap16">
             <property name="label" translatable="yes">True</property>
+            <layout>
+              <property name="left_attach">0</property>
+              <property name="top_attach">16</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">0</property>
-            <property name="top_attach">16</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="ellipsize16">
             <property name="label" translatable="yes">end</property>
+            <layout>
+              <property name="left_attach">1</property>
+              <property name="top_attach">16</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">1</property>
-            <property name="top_attach">16</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="width_chars16">
             <property name="label" translatable="yes">12</property>
+            <layout>
+              <property name="left_attach">2</property>
+              <property name="top_attach">16</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">2</property>
-            <property name="top_attach">16</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="max_width_chars16">
             <property name="label" translatable="yes">-1</property>
+            <layout>
+              <property name="left_attach">3</property>
+              <property name="top_attach">16</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">3</property>
-            <property name="top_attach">16</property>
-          </packing>
         </child>
         <child>
           <object class="GtkPaned" id="paned16">
-            <property name="shrink-child2">False</property>
-            <property name="resize-child2">True</property>
-            <property name="shrink-child1">False</property>
-            <property name="resize-child1">False</property>
+            <property name="shrink-child2">0</property>
+            <property name="shrink-child1">0</property>
+            <property name="resize-child1">0</property>
             <property name="can_focus">1</property>
             <child>
               <object class="GtkPaned" id="required16">
-                <property name="shrink-child2">False</property>
-                <property name="resize-child2">True</property>
-                <property name="shrink-child1">False</property>
-                <property name="resize-child1">False</property>
+                <property name="shrink-child2">0</property>
+                <property name="shrink-child1">0</property>
+                <property name="resize-child1">0</property>
                 <property name="can_focus">1</property>
                 <property name="orientation">vertical</property>
                 <child>
@@ -1876,10 +1830,9 @@ ABCD</property>
             </child>
             <child>
               <object class="GtkPaned" id="natural16">
-                <property name="shrink-child2">False</property>
-                <property name="resize-child2">True</property>
-                <property name="shrink-child1">False</property>
-                <property name="resize-child1">False</property>
+                <property name="shrink-child2">0</property>
+                <property name="shrink-child1">0</property>
+                <property name="resize-child1">0</property>
                 <property name="can_focus">1</property>
                 <property name="orientation">vertical</property>
                 <child>
@@ -1908,61 +1861,59 @@ ABCD</property>
                 </child>
               </object>
             </child>
+            <layout>
+              <property name="left_attach">4</property>
+              <property name="top_attach">16</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">4</property>
-            <property name="top_attach">16</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="wrap17">
             <property name="label" translatable="yes">False</property>
+            <layout>
+              <property name="left_attach">0</property>
+              <property name="top_attach">17</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">0</property>
-            <property name="top_attach">17</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="ellipsize17">
             <property name="label" translatable="yes">none</property>
+            <layout>
+              <property name="left_attach">1</property>
+              <property name="top_attach">17</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">1</property>
-            <property name="top_attach">17</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="width_chars17">
             <property name="label" translatable="yes">-1</property>
+            <layout>
+              <property name="left_attach">2</property>
+              <property name="top_attach">17</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">2</property>
-            <property name="top_attach">17</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="max_width_chars17">
             <property name="label" translatable="yes">4</property>
+            <layout>
+              <property name="left_attach">3</property>
+              <property name="top_attach">17</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">3</property>
-            <property name="top_attach">17</property>
-          </packing>
         </child>
         <child>
           <object class="GtkPaned" id="paned17">
-            <property name="shrink-child2">False</property>
-            <property name="resize-child2">True</property>
-            <property name="shrink-child1">False</property>
-            <property name="resize-child1">False</property>
+            <property name="shrink-child2">0</property>
+            <property name="shrink-child1">0</property>
+            <property name="resize-child1">0</property>
             <property name="can_focus">1</property>
             <child>
               <object class="GtkPaned" id="required17">
-                <property name="shrink-child2">False</property>
-                <property name="resize-child2">True</property>
-                <property name="shrink-child1">False</property>
-                <property name="resize-child1">False</property>
+                <property name="shrink-child2">0</property>
+                <property name="shrink-child1">0</property>
+                <property name="resize-child1">0</property>
                 <property name="can_focus">1</property>
                 <property name="orientation">vertical</property>
                 <child>
@@ -1993,10 +1944,9 @@ ABCD</property>
             </child>
             <child>
               <object class="GtkPaned" id="natural17">
-                <property name="shrink-child2">False</property>
-                <property name="resize-child2">True</property>
-                <property name="shrink-child1">False</property>
-                <property name="resize-child1">False</property>
+                <property name="shrink-child2">0</property>
+                <property name="shrink-child1">0</property>
+                <property name="resize-child1">0</property>
                 <property name="can_focus">1</property>
                 <property name="orientation">vertical</property>
                 <child>
@@ -2025,61 +1975,59 @@ ABCD</property>
                 </child>
               </object>
             </child>
+            <layout>
+              <property name="left_attach">4</property>
+              <property name="top_attach">17</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">4</property>
-            <property name="top_attach">17</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="wrap18">
             <property name="label" translatable="yes">True</property>
+            <layout>
+              <property name="left_attach">0</property>
+              <property name="top_attach">18</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">0</property>
-            <property name="top_attach">18</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="ellipsize18">
             <property name="label" translatable="yes">none</property>
+            <layout>
+              <property name="left_attach">1</property>
+              <property name="top_attach">18</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">1</property>
-            <property name="top_attach">18</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="width_chars18">
             <property name="label" translatable="yes">-1</property>
+            <layout>
+              <property name="left_attach">2</property>
+              <property name="top_attach">18</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">2</property>
-            <property name="top_attach">18</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="max_width_chars18">
             <property name="label" translatable="yes">4</property>
+            <layout>
+              <property name="left_attach">3</property>
+              <property name="top_attach">18</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">3</property>
-            <property name="top_attach">18</property>
-          </packing>
         </child>
         <child>
           <object class="GtkPaned" id="paned18">
-            <property name="shrink-child2">False</property>
-            <property name="resize-child2">True</property>
-            <property name="shrink-child1">False</property>
-            <property name="resize-child1">False</property>
+            <property name="shrink-child2">0</property>
+            <property name="shrink-child1">0</property>
+            <property name="resize-child1">0</property>
             <property name="can_focus">1</property>
             <child>
               <object class="GtkPaned" id="required18">
-                <property name="shrink-child2">False</property>
-                <property name="resize-child2">True</property>
-                <property name="shrink-child1">False</property>
-                <property name="resize-child1">False</property>
+                <property name="shrink-child2">0</property>
+                <property name="shrink-child1">0</property>
+                <property name="resize-child1">0</property>
                 <property name="can_focus">1</property>
                 <property name="orientation">vertical</property>
                 <child>
@@ -2112,10 +2060,9 @@ ABCD</property>
             </child>
             <child>
               <object class="GtkPaned" id="natural18">
-                <property name="shrink-child2">False</property>
-                <property name="resize-child2">True</property>
-                <property name="shrink-child1">False</property>
-                <property name="resize-child1">False</property>
+                <property name="shrink-child2">0</property>
+                <property name="shrink-child1">0</property>
+                <property name="resize-child1">0</property>
                 <property name="can_focus">1</property>
                 <property name="orientation">vertical</property>
                 <child>
@@ -2146,61 +2093,59 @@ ABCD</property>
                 </child>
               </object>
             </child>
+            <layout>
+              <property name="left_attach">4</property>
+              <property name="top_attach">18</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">4</property>
-            <property name="top_attach">18</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="wrap19">
             <property name="label" translatable="yes">False</property>
+            <layout>
+              <property name="left_attach">0</property>
+              <property name="top_attach">19</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">0</property>
-            <property name="top_attach">19</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="ellipsize19">
             <property name="label" translatable="yes">end</property>
+            <layout>
+              <property name="left_attach">1</property>
+              <property name="top_attach">19</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">1</property>
-            <property name="top_attach">19</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="width_chars19">
             <property name="label" translatable="yes">-1</property>
+            <layout>
+              <property name="left_attach">2</property>
+              <property name="top_attach">19</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">2</property>
-            <property name="top_attach">19</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="max_width_chars19">
             <property name="label" translatable="yes">4</property>
+            <layout>
+              <property name="left_attach">3</property>
+              <property name="top_attach">19</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">3</property>
-            <property name="top_attach">19</property>
-          </packing>
         </child>
         <child>
           <object class="GtkPaned" id="paned19">
-            <property name="shrink-child2">False</property>
-            <property name="resize-child2">True</property>
-            <property name="shrink-child1">False</property>
-            <property name="resize-child1">False</property>
+            <property name="shrink-child2">0</property>
+            <property name="shrink-child1">0</property>
+            <property name="resize-child1">0</property>
             <property name="can_focus">1</property>
             <child>
               <object class="GtkPaned" id="required19">
-                <property name="shrink-child2">False</property>
-                <property name="resize-child2">True</property>
-                <property name="shrink-child1">False</property>
-                <property name="resize-child1">False</property>
+                <property name="shrink-child2">0</property>
+                <property name="shrink-child1">0</property>
+                <property name="resize-child1">0</property>
                 <property name="can_focus">1</property>
                 <property name="orientation">vertical</property>
                 <child>
@@ -2231,10 +2176,9 @@ ABCD</property>
             </child>
             <child>
               <object class="GtkPaned" id="natural19">
-                <property name="shrink-child2">False</property>
-                <property name="resize-child2">True</property>
-                <property name="shrink-child1">False</property>
-                <property name="resize-child1">False</property>
+                <property name="shrink-child2">0</property>
+                <property name="shrink-child1">0</property>
+                <property name="resize-child1">0</property>
                 <property name="can_focus">1</property>
                 <property name="orientation">vertical</property>
                 <child>
@@ -2263,61 +2207,59 @@ ABCD</property>
                 </child>
               </object>
             </child>
+            <layout>
+              <property name="left_attach">4</property>
+              <property name="top_attach">19</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">4</property>
-            <property name="top_attach">19</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="wrap20">
             <property name="label" translatable="yes">True</property>
+            <layout>
+              <property name="left_attach">0</property>
+              <property name="top_attach">20</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">0</property>
-            <property name="top_attach">20</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="ellipsize20">
             <property name="label" translatable="yes">end</property>
+            <layout>
+              <property name="left_attach">1</property>
+              <property name="top_attach">20</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">1</property>
-            <property name="top_attach">20</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="width_chars20">
             <property name="label" translatable="yes">-1</property>
+            <layout>
+              <property name="left_attach">2</property>
+              <property name="top_attach">20</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">2</property>
-            <property name="top_attach">20</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="max_width_chars20">
             <property name="label" translatable="yes">4</property>
+            <layout>
+              <property name="left_attach">3</property>
+              <property name="top_attach">20</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">3</property>
-            <property name="top_attach">20</property>
-          </packing>
         </child>
         <child>
           <object class="GtkPaned" id="paned20">
-            <property name="shrink-child2">False</property>
-            <property name="resize-child2">True</property>
-            <property name="shrink-child1">False</property>
-            <property name="resize-child1">False</property>
+            <property name="shrink-child2">0</property>
+            <property name="shrink-child1">0</property>
+            <property name="resize-child1">0</property>
             <property name="can_focus">1</property>
             <child>
               <object class="GtkPaned" id="required20">
-                <property name="shrink-child2">False</property>
-                <property name="resize-child2">True</property>
-                <property name="shrink-child1">False</property>
-                <property name="resize-child1">False</property>
+                <property name="shrink-child2">0</property>
+                <property name="shrink-child1">0</property>
+                <property name="resize-child1">0</property>
                 <property name="can_focus">1</property>
                 <property name="orientation">vertical</property>
                 <child>
@@ -2348,10 +2290,9 @@ ABCD</property>
             </child>
             <child>
               <object class="GtkPaned" id="natural20">
-                <property name="shrink-child2">False</property>
-                <property name="resize-child2">True</property>
-                <property name="shrink-child1">False</property>
-                <property name="resize-child1">False</property>
+                <property name="shrink-child2">0</property>
+                <property name="shrink-child1">0</property>
+                <property name="resize-child1">0</property>
                 <property name="can_focus">1</property>
                 <property name="orientation">vertical</property>
                 <child>
@@ -2380,61 +2321,59 @@ ABCD</property>
                 </child>
               </object>
             </child>
+            <layout>
+              <property name="left_attach">4</property>
+              <property name="top_attach">20</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">4</property>
-            <property name="top_attach">20</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="wrap21">
             <property name="label" translatable="yes">False</property>
+            <layout>
+              <property name="left_attach">0</property>
+              <property name="top_attach">21</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">0</property>
-            <property name="top_attach">21</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="ellipsize21">
             <property name="label" translatable="yes">none</property>
+            <layout>
+              <property name="left_attach">1</property>
+              <property name="top_attach">21</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">1</property>
-            <property name="top_attach">21</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="width_chars21">
             <property name="label" translatable="yes">4</property>
+            <layout>
+              <property name="left_attach">2</property>
+              <property name="top_attach">21</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">2</property>
-            <property name="top_attach">21</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="max_width_chars21">
             <property name="label" translatable="yes">4</property>
+            <layout>
+              <property name="left_attach">3</property>
+              <property name="top_attach">21</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">3</property>
-            <property name="top_attach">21</property>
-          </packing>
         </child>
         <child>
           <object class="GtkPaned" id="paned21">
-            <property name="shrink-child2">False</property>
-            <property name="resize-child2">True</property>
-            <property name="shrink-child1">False</property>
-            <property name="resize-child1">False</property>
+            <property name="shrink-child2">0</property>
+            <property name="shrink-child1">0</property>
+            <property name="resize-child1">0</property>
             <property name="can_focus">1</property>
             <child>
               <object class="GtkPaned" id="required21">
-                <property name="shrink-child2">False</property>
-                <property name="resize-child2">True</property>
-                <property name="shrink-child1">False</property>
-                <property name="resize-child1">False</property>
+                <property name="shrink-child2">0</property>
+                <property name="shrink-child1">0</property>
+                <property name="resize-child1">0</property>
                 <property name="can_focus">1</property>
                 <property name="orientation">vertical</property>
                 <child>
@@ -2467,10 +2406,9 @@ ABCD</property>
             </child>
             <child>
               <object class="GtkPaned" id="natural21">
-                <property name="shrink-child2">False</property>
-                <property name="resize-child2">True</property>
-                <property name="shrink-child1">False</property>
-                <property name="resize-child1">False</property>
+                <property name="shrink-child2">0</property>
+                <property name="shrink-child1">0</property>
+                <property name="resize-child1">0</property>
                 <property name="can_focus">1</property>
                 <property name="orientation">vertical</property>
                 <child>
@@ -2501,61 +2439,59 @@ ABCD</property>
                 </child>
               </object>
             </child>
+            <layout>
+              <property name="left_attach">4</property>
+              <property name="top_attach">21</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">4</property>
-            <property name="top_attach">21</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="wrap22">
             <property name="label" translatable="yes">True</property>
+            <layout>
+              <property name="left_attach">0</property>
+              <property name="top_attach">22</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">0</property>
-            <property name="top_attach">22</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="ellipsize22">
             <property name="label" translatable="yes">none</property>
+            <layout>
+              <property name="left_attach">1</property>
+              <property name="top_attach">22</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">1</property>
-            <property name="top_attach">22</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="width_chars22">
             <property name="label" translatable="yes">4</property>
+            <layout>
+              <property name="left_attach">2</property>
+              <property name="top_attach">22</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">2</property>
-            <property name="top_attach">22</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="max_width_chars22">
             <property name="label" translatable="yes">4</property>
+            <layout>
+              <property name="left_attach">3</property>
+              <property name="top_attach">22</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">3</property>
-            <property name="top_attach">22</property>
-          </packing>
         </child>
         <child>
           <object class="GtkPaned" id="paned22">
-            <property name="shrink-child2">False</property>
-            <property name="resize-child2">True</property>
-            <property name="shrink-child1">False</property>
-            <property name="resize-child1">False</property>
+            <property name="shrink-child2">0</property>
+            <property name="shrink-child1">0</property>
+            <property name="resize-child1">0</property>
             <property name="can_focus">1</property>
             <child>
               <object class="GtkPaned" id="required22">
-                <property name="shrink-child2">False</property>
-                <property name="resize-child2">True</property>
-                <property name="shrink-child1">False</property>
-                <property name="resize-child1">False</property>
+                <property name="shrink-child2">0</property>
+                <property name="shrink-child1">0</property>
+                <property name="resize-child1">0</property>
                 <property name="can_focus">1</property>
                 <property name="orientation">vertical</property>
                 <child>
@@ -2590,10 +2526,9 @@ ABCD</property>
             </child>
             <child>
               <object class="GtkPaned" id="natural22">
-                <property name="shrink-child2">False</property>
-                <property name="resize-child2">True</property>
-                <property name="shrink-child1">False</property>
-                <property name="resize-child1">False</property>
+                <property name="shrink-child2">0</property>
+                <property name="shrink-child1">0</property>
+                <property name="resize-child1">0</property>
                 <property name="can_focus">1</property>
                 <property name="orientation">vertical</property>
                 <child>
@@ -2626,61 +2561,59 @@ ABCD</property>
                 </child>
               </object>
             </child>
+            <layout>
+              <property name="left_attach">4</property>
+              <property name="top_attach">22</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">4</property>
-            <property name="top_attach">22</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="wrap23">
             <property name="label" translatable="yes">False</property>
+            <layout>
+              <property name="left_attach">0</property>
+              <property name="top_attach">23</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">0</property>
-            <property name="top_attach">23</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="ellipsize23">
             <property name="label" translatable="yes">end</property>
+            <layout>
+              <property name="left_attach">1</property>
+              <property name="top_attach">23</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">1</property>
-            <property name="top_attach">23</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="width_chars23">
             <property name="label" translatable="yes">4</property>
+            <layout>
+              <property name="left_attach">2</property>
+              <property name="top_attach">23</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">2</property>
-            <property name="top_attach">23</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="max_width_chars23">
             <property name="label" translatable="yes">4</property>
+            <layout>
+              <property name="left_attach">3</property>
+              <property name="top_attach">23</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">3</property>
-            <property name="top_attach">23</property>
-          </packing>
         </child>
         <child>
           <object class="GtkPaned" id="paned23">
-            <property name="shrink-child2">False</property>
-            <property name="resize-child2">True</property>
-            <property name="shrink-child1">False</property>
-            <property name="resize-child1">False</property>
+            <property name="shrink-child2">0</property>
+            <property name="shrink-child1">0</property>
+            <property name="resize-child1">0</property>
             <property name="can_focus">1</property>
             <child>
               <object class="GtkPaned" id="required23">
-                <property name="shrink-child2">False</property>
-                <property name="resize-child2">True</property>
-                <property name="shrink-child1">False</property>
-                <property name="resize-child1">False</property>
+                <property name="shrink-child2">0</property>
+                <property name="shrink-child1">0</property>
+                <property name="resize-child1">0</property>
                 <property name="can_focus">1</property>
                 <property name="orientation">vertical</property>
                 <child>
@@ -2713,10 +2646,9 @@ ABCD</property>
             </child>
             <child>
               <object class="GtkPaned" id="natural23">
-                <property name="shrink-child2">False</property>
-                <property name="resize-child2">True</property>
-                <property name="shrink-child1">False</property>
-                <property name="resize-child1">False</property>
+                <property name="shrink-child2">0</property>
+                <property name="shrink-child1">0</property>
+                <property name="resize-child1">0</property>
                 <property name="can_focus">1</property>
                 <property name="orientation">vertical</property>
                 <child>
@@ -2747,61 +2679,59 @@ ABCD</property>
                 </child>
               </object>
             </child>
+            <layout>
+              <property name="left_attach">4</property>
+              <property name="top_attach">23</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">4</property>
-            <property name="top_attach">23</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="wrap24">
             <property name="label" translatable="yes">True</property>
+            <layout>
+              <property name="left_attach">0</property>
+              <property name="top_attach">24</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">0</property>
-            <property name="top_attach">24</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="ellipsize24">
             <property name="label" translatable="yes">end</property>
+            <layout>
+              <property name="left_attach">1</property>
+              <property name="top_attach">24</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">1</property>
-            <property name="top_attach">24</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="width_chars24">
             <property name="label" translatable="yes">4</property>
+            <layout>
+              <property name="left_attach">2</property>
+              <property name="top_attach">24</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">2</property>
-            <property name="top_attach">24</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="max_width_chars24">
             <property name="label" translatable="yes">4</property>
+            <layout>
+              <property name="left_attach">3</property>
+              <property name="top_attach">24</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">3</property>
-            <property name="top_attach">24</property>
-          </packing>
         </child>
         <child>
           <object class="GtkPaned" id="paned24">
-            <property name="shrink-child2">False</property>
-            <property name="resize-child2">True</property>
-            <property name="shrink-child1">False</property>
-            <property name="resize-child1">False</property>
+            <property name="shrink-child2">0</property>
+            <property name="shrink-child1">0</property>
+            <property name="resize-child1">0</property>
             <property name="can_focus">1</property>
             <child>
               <object class="GtkPaned" id="required24">
-                <property name="shrink-child2">False</property>
-                <property name="resize-child2">True</property>
-                <property name="shrink-child1">False</property>
-                <property name="resize-child1">False</property>
+                <property name="shrink-child2">0</property>
+                <property name="shrink-child1">0</property>
+                <property name="resize-child1">0</property>
                 <property name="can_focus">1</property>
                 <property name="orientation">vertical</property>
                 <child>
@@ -2834,10 +2764,9 @@ ABCD</property>
             </child>
             <child>
               <object class="GtkPaned" id="natural24">
-                <property name="shrink-child2">False</property>
-                <property name="resize-child2">True</property>
-                <property name="shrink-child1">False</property>
-                <property name="resize-child1">False</property>
+                <property name="shrink-child2">0</property>
+                <property name="shrink-child1">0</property>
+                <property name="resize-child1">0</property>
                 <property name="can_focus">1</property>
                 <property name="orientation">vertical</property>
                 <child>
@@ -2868,61 +2797,59 @@ ABCD</property>
                 </child>
               </object>
             </child>
+            <layout>
+              <property name="left_attach">4</property>
+              <property name="top_attach">24</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">4</property>
-            <property name="top_attach">24</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="wrap25">
             <property name="label" translatable="yes">False</property>
+            <layout>
+              <property name="left_attach">0</property>
+              <property name="top_attach">25</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">0</property>
-            <property name="top_attach">25</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="ellipsize25">
             <property name="label" translatable="yes">none</property>
+            <layout>
+              <property name="left_attach">1</property>
+              <property name="top_attach">25</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">1</property>
-            <property name="top_attach">25</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="width_chars25">
             <property name="label" translatable="yes">8</property>
+            <layout>
+              <property name="left_attach">2</property>
+              <property name="top_attach">25</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">2</property>
-            <property name="top_attach">25</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="max_width_chars25">
             <property name="label" translatable="yes">4</property>
+            <layout>
+              <property name="left_attach">3</property>
+              <property name="top_attach">25</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">3</property>
-            <property name="top_attach">25</property>
-          </packing>
         </child>
         <child>
           <object class="GtkPaned" id="paned25">
-            <property name="shrink-child2">False</property>
-            <property name="resize-child2">True</property>
-            <property name="shrink-child1">False</property>
-            <property name="resize-child1">False</property>
+            <property name="shrink-child2">0</property>
+            <property name="shrink-child1">0</property>
+            <property name="resize-child1">0</property>
             <property name="can_focus">1</property>
             <child>
               <object class="GtkPaned" id="required25">
-                <property name="shrink-child2">False</property>
-                <property name="resize-child2">True</property>
-                <property name="shrink-child1">False</property>
-                <property name="resize-child1">False</property>
+                <property name="shrink-child2">0</property>
+                <property name="shrink-child1">0</property>
+                <property name="resize-child1">0</property>
                 <property name="can_focus">1</property>
                 <property name="orientation">vertical</property>
                 <child>
@@ -2955,10 +2882,9 @@ ABCD</property>
             </child>
             <child>
               <object class="GtkPaned" id="natural25">
-                <property name="shrink-child2">False</property>
-                <property name="resize-child2">True</property>
-                <property name="shrink-child1">False</property>
-                <property name="resize-child1">False</property>
+                <property name="shrink-child2">0</property>
+                <property name="shrink-child1">0</property>
+                <property name="resize-child1">0</property>
                 <property name="can_focus">1</property>
                 <property name="orientation">vertical</property>
                 <child>
@@ -2989,61 +2915,59 @@ ABCD</property>
                 </child>
               </object>
             </child>
+            <layout>
+              <property name="left_attach">4</property>
+              <property name="top_attach">25</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">4</property>
-            <property name="top_attach">25</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="wrap26">
             <property name="label" translatable="yes">True</property>
+            <layout>
+              <property name="left_attach">0</property>
+              <property name="top_attach">26</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">0</property>
-            <property name="top_attach">26</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="ellipsize26">
             <property name="label" translatable="yes">none</property>
+            <layout>
+              <property name="left_attach">1</property>
+              <property name="top_attach">26</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">1</property>
-            <property name="top_attach">26</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="width_chars26">
             <property name="label" translatable="yes">8</property>
+            <layout>
+              <property name="left_attach">2</property>
+              <property name="top_attach">26</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">2</property>
-            <property name="top_attach">26</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="max_width_chars26">
             <property name="label" translatable="yes">4</property>
+            <layout>
+              <property name="left_attach">3</property>
+              <property name="top_attach">26</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">3</property>
-            <property name="top_attach">26</property>
-          </packing>
         </child>
         <child>
           <object class="GtkPaned" id="paned26">
-            <property name="shrink-child2">False</property>
-            <property name="resize-child2">True</property>
-            <property name="shrink-child1">False</property>
-            <property name="resize-child1">False</property>
+            <property name="shrink-child2">0</property>
+            <property name="shrink-child1">0</property>
+            <property name="resize-child1">0</property>
             <property name="can_focus">1</property>
             <child>
               <object class="GtkPaned" id="required26">
-                <property name="shrink-child2">False</property>
-                <property name="resize-child2">True</property>
-                <property name="shrink-child1">False</property>
-                <property name="resize-child1">False</property>
+                <property name="shrink-child2">0</property>
+                <property name="shrink-child1">0</property>
+                <property name="resize-child1">0</property>
                 <property name="can_focus">1</property>
                 <property name="orientation">vertical</property>
                 <child>
@@ -3078,10 +3002,9 @@ ABCD</property>
             </child>
             <child>
               <object class="GtkPaned" id="natural26">
-                <property name="shrink-child2">False</property>
-                <property name="resize-child2">True</property>
-                <property name="shrink-child1">False</property>
-                <property name="resize-child1">False</property>
+                <property name="shrink-child2">0</property>
+                <property name="shrink-child1">0</property>
+                <property name="resize-child1">0</property>
                 <property name="can_focus">1</property>
                 <property name="orientation">vertical</property>
                 <child>
@@ -3114,61 +3037,59 @@ ABCD</property>
                 </child>
               </object>
             </child>
+            <layout>
+              <property name="left_attach">4</property>
+              <property name="top_attach">26</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">4</property>
-            <property name="top_attach">26</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="wrap27">
             <property name="label" translatable="yes">False</property>
+            <layout>
+              <property name="left_attach">0</property>
+              <property name="top_attach">27</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">0</property>
-            <property name="top_attach">27</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="ellipsize27">
             <property name="label" translatable="yes">end</property>
+            <layout>
+              <property name="left_attach">1</property>
+              <property name="top_attach">27</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">1</property>
-            <property name="top_attach">27</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="width_chars27">
             <property name="label" translatable="yes">8</property>
+            <layout>
+              <property name="left_attach">2</property>
+              <property name="top_attach">27</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">2</property>
-            <property name="top_attach">27</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="max_width_chars27">
             <property name="label" translatable="yes">4</property>
+            <layout>
+              <property name="left_attach">3</property>
+              <property name="top_attach">27</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">3</property>
-            <property name="top_attach">27</property>
-          </packing>
         </child>
         <child>
           <object class="GtkPaned" id="paned27">
-            <property name="shrink-child2">False</property>
-            <property name="resize-child2">True</property>
-            <property name="shrink-child1">False</property>
-            <property name="resize-child1">False</property>
+            <property name="shrink-child2">0</property>
+            <property name="shrink-child1">0</property>
+            <property name="resize-child1">0</property>
             <property name="can_focus">1</property>
             <child>
               <object class="GtkPaned" id="required27">
-                <property name="shrink-child2">False</property>
-                <property name="resize-child2">True</property>
-                <property name="shrink-child1">False</property>
-                <property name="resize-child1">False</property>
+                <property name="shrink-child2">0</property>
+                <property name="shrink-child1">0</property>
+                <property name="resize-child1">0</property>
                 <property name="can_focus">1</property>
                 <property name="orientation">vertical</property>
                 <child>
@@ -3201,10 +3122,9 @@ ABCD</property>
             </child>
             <child>
               <object class="GtkPaned" id="natural27">
-                <property name="shrink-child2">False</property>
-                <property name="resize-child2">True</property>
-                <property name="shrink-child1">False</property>
-                <property name="resize-child1">False</property>
+                <property name="shrink-child2">0</property>
+                <property name="shrink-child1">0</property>
+                <property name="resize-child1">0</property>
                 <property name="can_focus">1</property>
                 <property name="orientation">vertical</property>
                 <child>
@@ -3235,61 +3155,59 @@ ABCD</property>
                 </child>
               </object>
             </child>
+            <layout>
+              <property name="left_attach">4</property>
+              <property name="top_attach">27</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">4</property>
-            <property name="top_attach">27</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="wrap28">
             <property name="label" translatable="yes">True</property>
+            <layout>
+              <property name="left_attach">0</property>
+              <property name="top_attach">28</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">0</property>
-            <property name="top_attach">28</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="ellipsize28">
             <property name="label" translatable="yes">end</property>
+            <layout>
+              <property name="left_attach">1</property>
+              <property name="top_attach">28</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">1</property>
-            <property name="top_attach">28</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="width_chars28">
             <property name="label" translatable="yes">8</property>
+            <layout>
+              <property name="left_attach">2</property>
+              <property name="top_attach">28</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">2</property>
-            <property name="top_attach">28</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="max_width_chars28">
             <property name="label" translatable="yes">4</property>
+            <layout>
+              <property name="left_attach">3</property>
+              <property name="top_attach">28</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">3</property>
-            <property name="top_attach">28</property>
-          </packing>
         </child>
         <child>
           <object class="GtkPaned" id="paned28">
-            <property name="shrink-child2">False</property>
-            <property name="resize-child2">True</property>
-            <property name="shrink-child1">False</property>
-            <property name="resize-child1">False</property>
+            <property name="shrink-child2">0</property>
+            <property name="shrink-child1">0</property>
+            <property name="resize-child1">0</property>
             <property name="can_focus">1</property>
             <child>
               <object class="GtkPaned" id="required28">
-                <property name="shrink-child2">False</property>
-                <property name="resize-child2">True</property>
-                <property name="shrink-child1">False</property>
-                <property name="resize-child1">False</property>
+                <property name="shrink-child2">0</property>
+                <property name="shrink-child1">0</property>
+                <property name="resize-child1">0</property>
                 <property name="can_focus">1</property>
                 <property name="orientation">vertical</property>
                 <child>
@@ -3322,10 +3240,9 @@ ABCD</property>
             </child>
             <child>
               <object class="GtkPaned" id="natural28">
-                <property name="shrink-child2">False</property>
-                <property name="resize-child2">True</property>
-                <property name="shrink-child1">False</property>
-                <property name="resize-child1">False</property>
+                <property name="shrink-child2">0</property>
+                <property name="shrink-child1">0</property>
+                <property name="resize-child1">0</property>
                 <property name="can_focus">1</property>
                 <property name="orientation">vertical</property>
                 <child>
@@ -3356,61 +3273,59 @@ ABCD</property>
                 </child>
               </object>
             </child>
+            <layout>
+              <property name="left_attach">4</property>
+              <property name="top_attach">28</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">4</property>
-            <property name="top_attach">28</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="wrap29">
             <property name="label" translatable="yes">False</property>
+            <layout>
+              <property name="left_attach">0</property>
+              <property name="top_attach">29</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">0</property>
-            <property name="top_attach">29</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="ellipsize29">
             <property name="label" translatable="yes">none</property>
+            <layout>
+              <property name="left_attach">1</property>
+              <property name="top_attach">29</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">1</property>
-            <property name="top_attach">29</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="width_chars29">
             <property name="label" translatable="yes">12</property>
+            <layout>
+              <property name="left_attach">2</property>
+              <property name="top_attach">29</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">2</property>
-            <property name="top_attach">29</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="max_width_chars29">
             <property name="label" translatable="yes">4</property>
+            <layout>
+              <property name="left_attach">3</property>
+              <property name="top_attach">29</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">3</property>
-            <property name="top_attach">29</property>
-          </packing>
         </child>
         <child>
           <object class="GtkPaned" id="paned29">
-            <property name="shrink-child2">False</property>
-            <property name="resize-child2">True</property>
-            <property name="shrink-child1">False</property>
-            <property name="resize-child1">False</property>
+            <property name="shrink-child2">0</property>
+            <property name="shrink-child1">0</property>
+            <property name="resize-child1">0</property>
             <property name="can_focus">1</property>
             <child>
               <object class="GtkPaned" id="required29">
-                <property name="shrink-child2">False</property>
-                <property name="resize-child2">True</property>
-                <property name="shrink-child1">False</property>
-                <property name="resize-child1">False</property>
+                <property name="shrink-child2">0</property>
+                <property name="shrink-child1">0</property>
+                <property name="resize-child1">0</property>
                 <property name="can_focus">1</property>
                 <property name="orientation">vertical</property>
                 <child>
@@ -3443,10 +3358,9 @@ ABCD</property>
             </child>
             <child>
               <object class="GtkPaned" id="natural29">
-                <property name="shrink-child2">False</property>
-                <property name="resize-child2">True</property>
-                <property name="shrink-child1">False</property>
-                <property name="resize-child1">False</property>
+                <property name="shrink-child2">0</property>
+                <property name="shrink-child1">0</property>
+                <property name="resize-child1">0</property>
                 <property name="can_focus">1</property>
                 <property name="orientation">vertical</property>
                 <child>
@@ -3477,61 +3391,59 @@ ABCD</property>
                 </child>
               </object>
             </child>
+            <layout>
+              <property name="left_attach">4</property>
+              <property name="top_attach">29</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">4</property>
-            <property name="top_attach">29</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="wrap30">
             <property name="label" translatable="yes">True</property>
+            <layout>
+              <property name="left_attach">0</property>
+              <property name="top_attach">30</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">0</property>
-            <property name="top_attach">30</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="ellipsize30">
             <property name="label" translatable="yes">none</property>
+            <layout>
+              <property name="left_attach">1</property>
+              <property name="top_attach">30</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">1</property>
-            <property name="top_attach">30</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="width_chars30">
             <property name="label" translatable="yes">12</property>
+            <layout>
+              <property name="left_attach">2</property>
+              <property name="top_attach">30</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">2</property>
-            <property name="top_attach">30</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="max_width_chars30">
             <property name="label" translatable="yes">4</property>
+            <layout>
+              <property name="left_attach">3</property>
+              <property name="top_attach">30</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">3</property>
-            <property name="top_attach">30</property>
-          </packing>
         </child>
         <child>
           <object class="GtkPaned" id="paned30">
-            <property name="shrink-child2">False</property>
-            <property name="resize-child2">True</property>
-            <property name="shrink-child1">False</property>
-            <property name="resize-child1">False</property>
+            <property name="shrink-child2">0</property>
+            <property name="shrink-child1">0</property>
+            <property name="resize-child1">0</property>
             <property name="can_focus">1</property>
             <child>
               <object class="GtkPaned" id="required30">
-                <property name="shrink-child2">False</property>
-                <property name="resize-child2">True</property>
-                <property name="shrink-child1">False</property>
-                <property name="resize-child1">False</property>
+                <property name="shrink-child2">0</property>
+                <property name="shrink-child1">0</property>
+                <property name="resize-child1">0</property>
                 <property name="can_focus">1</property>
                 <property name="orientation">vertical</property>
                 <child>
@@ -3564,10 +3476,9 @@ ABCD</property>
             </child>
             <child>
               <object class="GtkPaned" id="natural30">
-                <property name="shrink-child2">False</property>
-                <property name="resize-child2">True</property>
-                <property name="shrink-child1">False</property>
-                <property name="resize-child1">False</property>
+                <property name="shrink-child2">0</property>
+                <property name="shrink-child1">0</property>
+                <property name="resize-child1">0</property>
                 <property name="can_focus">1</property>
                 <property name="orientation">vertical</property>
                 <child>
@@ -3598,61 +3509,59 @@ ABCD</property>
                 </child>
               </object>
             </child>
+            <layout>
+              <property name="left_attach">4</property>
+              <property name="top_attach">30</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">4</property>
-            <property name="top_attach">30</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="wrap31">
             <property name="label" translatable="yes">False</property>
+            <layout>
+              <property name="left_attach">0</property>
+              <property name="top_attach">31</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">0</property>
-            <property name="top_attach">31</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="ellipsize31">
             <property name="label" translatable="yes">end</property>
+            <layout>
+              <property name="left_attach">1</property>
+              <property name="top_attach">31</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">1</property>
-            <property name="top_attach">31</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="width_chars31">
             <property name="label" translatable="yes">12</property>
+            <layout>
+              <property name="left_attach">2</property>
+              <property name="top_attach">31</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">2</property>
-            <property name="top_attach">31</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="max_width_chars31">
             <property name="label" translatable="yes">4</property>
+            <layout>
+              <property name="left_attach">3</property>
+              <property name="top_attach">31</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">3</property>
-            <property name="top_attach">31</property>
-          </packing>
         </child>
         <child>
           <object class="GtkPaned" id="paned31">
-            <property name="shrink-child2">False</property>
-            <property name="resize-child2">True</property>
-            <property name="shrink-child1">False</property>
-            <property name="resize-child1">False</property>
+            <property name="shrink-child2">0</property>
+            <property name="shrink-child1">0</property>
+            <property name="resize-child1">0</property>
             <property name="can_focus">1</property>
             <child>
               <object class="GtkPaned" id="required31">
-                <property name="shrink-child2">False</property>
-                <property name="resize-child2">True</property>
-                <property name="shrink-child1">False</property>
-                <property name="resize-child1">False</property>
+                <property name="shrink-child2">0</property>
+                <property name="shrink-child1">0</property>
+                <property name="resize-child1">0</property>
                 <property name="can_focus">1</property>
                 <property name="orientation">vertical</property>
                 <child>
@@ -3685,10 +3594,9 @@ ABCD</property>
             </child>
             <child>
               <object class="GtkPaned" id="natural31">
-                <property name="shrink-child2">False</property>
-                <property name="resize-child2">True</property>
-                <property name="shrink-child1">False</property>
-                <property name="resize-child1">False</property>
+                <property name="shrink-child2">0</property>
+                <property name="shrink-child1">0</property>
+                <property name="resize-child1">0</property>
                 <property name="can_focus">1</property>
                 <property name="orientation">vertical</property>
                 <child>
@@ -3719,61 +3627,59 @@ ABCD</property>
                 </child>
               </object>
             </child>
+            <layout>
+              <property name="left_attach">4</property>
+              <property name="top_attach">31</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">4</property>
-            <property name="top_attach">31</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="wrap32">
             <property name="label" translatable="yes">True</property>
+            <layout>
+              <property name="left_attach">0</property>
+              <property name="top_attach">32</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">0</property>
-            <property name="top_attach">32</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="ellipsize32">
             <property name="label" translatable="yes">end</property>
+            <layout>
+              <property name="left_attach">1</property>
+              <property name="top_attach">32</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">1</property>
-            <property name="top_attach">32</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="width_chars32">
             <property name="label" translatable="yes">12</property>
+            <layout>
+              <property name="left_attach">2</property>
+              <property name="top_attach">32</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">2</property>
-            <property name="top_attach">32</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="max_width_chars32">
             <property name="label" translatable="yes">4</property>
+            <layout>
+              <property name="left_attach">3</property>
+              <property name="top_attach">32</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">3</property>
-            <property name="top_attach">32</property>
-          </packing>
         </child>
         <child>
           <object class="GtkPaned" id="paned32">
-            <property name="shrink-child2">False</property>
-            <property name="resize-child2">True</property>
-            <property name="shrink-child1">False</property>
-            <property name="resize-child1">False</property>
+            <property name="shrink-child2">0</property>
+            <property name="shrink-child1">0</property>
+            <property name="resize-child1">0</property>
             <property name="can_focus">1</property>
             <child>
               <object class="GtkPaned" id="required32">
-                <property name="shrink-child2">False</property>
-                <property name="resize-child2">True</property>
-                <property name="shrink-child1">False</property>
-                <property name="resize-child1">False</property>
+                <property name="shrink-child2">0</property>
+                <property name="shrink-child1">0</property>
+                <property name="resize-child1">0</property>
                 <property name="can_focus">1</property>
                 <property name="orientation">vertical</property>
                 <child>
@@ -3806,10 +3712,9 @@ ABCD</property>
             </child>
             <child>
               <object class="GtkPaned" id="natural32">
-                <property name="shrink-child2">False</property>
-                <property name="resize-child2">True</property>
-                <property name="shrink-child1">False</property>
-                <property name="resize-child1">False</property>
+                <property name="shrink-child2">0</property>
+                <property name="shrink-child1">0</property>
+                <property name="resize-child1">0</property>
                 <property name="can_focus">1</property>
                 <property name="orientation">vertical</property>
                 <child>
@@ -3840,61 +3745,59 @@ ABCD</property>
                 </child>
               </object>
             </child>
+            <layout>
+              <property name="left_attach">4</property>
+              <property name="top_attach">32</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">4</property>
-            <property name="top_attach">32</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="wrap33">
             <property name="label" translatable="yes">False</property>
+            <layout>
+              <property name="left_attach">0</property>
+              <property name="top_attach">33</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">0</property>
-            <property name="top_attach">33</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="ellipsize33">
             <property name="label" translatable="yes">none</property>
+            <layout>
+              <property name="left_attach">1</property>
+              <property name="top_attach">33</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">1</property>
-            <property name="top_attach">33</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="width_chars33">
             <property name="label" translatable="yes">-1</property>
+            <layout>
+              <property name="left_attach">2</property>
+              <property name="top_attach">33</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">2</property>
-            <property name="top_attach">33</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="max_width_chars33">
             <property name="label" translatable="yes">8</property>
+            <layout>
+              <property name="left_attach">3</property>
+              <property name="top_attach">33</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">3</property>
-            <property name="top_attach">33</property>
-          </packing>
         </child>
         <child>
           <object class="GtkPaned" id="paned33">
-            <property name="shrink-child2">False</property>
-            <property name="resize-child2">True</property>
-            <property name="shrink-child1">False</property>
-            <property name="resize-child1">False</property>
+            <property name="shrink-child2">0</property>
+            <property name="shrink-child1">0</property>
+            <property name="resize-child1">0</property>
             <property name="can_focus">1</property>
             <child>
               <object class="GtkPaned" id="required33">
-                <property name="shrink-child2">False</property>
-                <property name="resize-child2">True</property>
-                <property name="shrink-child1">False</property>
-                <property name="resize-child1">False</property>
+                <property name="shrink-child2">0</property>
+                <property name="shrink-child1">0</property>
+                <property name="resize-child1">0</property>
                 <property name="can_focus">1</property>
                 <property name="orientation">vertical</property>
                 <child>
@@ -3925,10 +3828,9 @@ ABCD</property>
             </child>
             <child>
               <object class="GtkPaned" id="natural33">
-                <property name="shrink-child2">False</property>
-                <property name="resize-child2">True</property>
-                <property name="shrink-child1">False</property>
-                <property name="resize-child1">False</property>
+                <property name="shrink-child2">0</property>
+                <property name="shrink-child1">0</property>
+                <property name="resize-child1">0</property>
                 <property name="can_focus">1</property>
                 <property name="orientation">vertical</property>
                 <child>
@@ -3957,61 +3859,59 @@ ABCD</property>
                 </child>
               </object>
             </child>
+            <layout>
+              <property name="left_attach">4</property>
+              <property name="top_attach">33</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">4</property>
-            <property name="top_attach">33</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="wrap34">
             <property name="label" translatable="yes">True</property>
+            <layout>
+              <property name="left_attach">0</property>
+              <property name="top_attach">34</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">0</property>
-            <property name="top_attach">34</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="ellipsize34">
             <property name="label" translatable="yes">none</property>
+            <layout>
+              <property name="left_attach">1</property>
+              <property name="top_attach">34</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">1</property>
-            <property name="top_attach">34</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="width_chars34">
             <property name="label" translatable="yes">-1</property>
+            <layout>
+              <property name="left_attach">2</property>
+              <property name="top_attach">34</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">2</property>
-            <property name="top_attach">34</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="max_width_chars34">
             <property name="label" translatable="yes">8</property>
+            <layout>
+              <property name="left_attach">3</property>
+              <property name="top_attach">34</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">3</property>
-            <property name="top_attach">34</property>
-          </packing>
         </child>
         <child>
           <object class="GtkPaned" id="paned34">
-            <property name="shrink-child2">False</property>
-            <property name="resize-child2">True</property>
-            <property name="shrink-child1">False</property>
-            <property name="resize-child1">False</property>
+            <property name="shrink-child2">0</property>
+            <property name="shrink-child1">0</property>
+            <property name="resize-child1">0</property>
             <property name="can_focus">1</property>
             <child>
               <object class="GtkPaned" id="required34">
-                <property name="shrink-child2">False</property>
-                <property name="resize-child2">True</property>
-                <property name="shrink-child1">False</property>
-                <property name="resize-child1">False</property>
+                <property name="shrink-child2">0</property>
+                <property name="shrink-child1">0</property>
+                <property name="resize-child1">0</property>
                 <property name="can_focus">1</property>
                 <property name="orientation">vertical</property>
                 <child>
@@ -4044,10 +3944,9 @@ ABCD</property>
             </child>
             <child>
               <object class="GtkPaned" id="natural34">
-                <property name="shrink-child2">False</property>
-                <property name="resize-child2">True</property>
-                <property name="shrink-child1">False</property>
-                <property name="resize-child1">False</property>
+                <property name="shrink-child2">0</property>
+                <property name="shrink-child1">0</property>
+                <property name="resize-child1">0</property>
                 <property name="can_focus">1</property>
                 <property name="orientation">vertical</property>
                 <child>
@@ -4078,61 +3977,59 @@ ABCD</property>
                 </child>
               </object>
             </child>
+            <layout>
+              <property name="left_attach">4</property>
+              <property name="top_attach">34</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">4</property>
-            <property name="top_attach">34</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="wrap35">
             <property name="label" translatable="yes">False</property>
+            <layout>
+              <property name="left_attach">0</property>
+              <property name="top_attach">35</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">0</property>
-            <property name="top_attach">35</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="ellipsize35">
             <property name="label" translatable="yes">end</property>
+            <layout>
+              <property name="left_attach">1</property>
+              <property name="top_attach">35</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">1</property>
-            <property name="top_attach">35</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="width_chars35">
             <property name="label" translatable="yes">-1</property>
+            <layout>
+              <property name="left_attach">2</property>
+              <property name="top_attach">35</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">2</property>
-            <property name="top_attach">35</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="max_width_chars35">
             <property name="label" translatable="yes">8</property>
+            <layout>
+              <property name="left_attach">3</property>
+              <property name="top_attach">35</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">3</property>
-            <property name="top_attach">35</property>
-          </packing>
         </child>
         <child>
           <object class="GtkPaned" id="paned35">
-            <property name="shrink-child2">False</property>
-            <property name="resize-child2">True</property>
-            <property name="shrink-child1">False</property>
-            <property name="resize-child1">False</property>
+            <property name="shrink-child2">0</property>
+            <property name="shrink-child1">0</property>
+            <property name="resize-child1">0</property>
             <property name="can_focus">1</property>
             <child>
               <object class="GtkPaned" id="required35">
-                <property name="shrink-child2">False</property>
-                <property name="resize-child2">True</property>
-                <property name="shrink-child1">False</property>
-                <property name="resize-child1">False</property>
+                <property name="shrink-child2">0</property>
+                <property name="shrink-child1">0</property>
+                <property name="resize-child1">0</property>
                 <property name="can_focus">1</property>
                 <property name="orientation">vertical</property>
                 <child>
@@ -4163,10 +4060,9 @@ ABCD</property>
             </child>
             <child>
               <object class="GtkPaned" id="natural35">
-                <property name="shrink-child2">False</property>
-                <property name="resize-child2">True</property>
-                <property name="shrink-child1">False</property>
-                <property name="resize-child1">False</property>
+                <property name="shrink-child2">0</property>
+                <property name="shrink-child1">0</property>
+                <property name="resize-child1">0</property>
                 <property name="can_focus">1</property>
                 <property name="orientation">vertical</property>
                 <child>
@@ -4195,61 +4091,59 @@ ABCD</property>
                 </child>
               </object>
             </child>
+            <layout>
+              <property name="left_attach">4</property>
+              <property name="top_attach">35</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">4</property>
-            <property name="top_attach">35</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="wrap36">
             <property name="label" translatable="yes">True</property>
+            <layout>
+              <property name="left_attach">0</property>
+              <property name="top_attach">36</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">0</property>
-            <property name="top_attach">36</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="ellipsize36">
             <property name="label" translatable="yes">end</property>
+            <layout>
+              <property name="left_attach">1</property>
+              <property name="top_attach">36</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">1</property>
-            <property name="top_attach">36</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="width_chars36">
             <property name="label" translatable="yes">-1</property>
+            <layout>
+              <property name="left_attach">2</property>
+              <property name="top_attach">36</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">2</property>
-            <property name="top_attach">36</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="max_width_chars36">
             <property name="label" translatable="yes">8</property>
+            <layout>
+              <property name="left_attach">3</property>
+              <property name="top_attach">36</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">3</property>
-            <property name="top_attach">36</property>
-          </packing>
         </child>
         <child>
           <object class="GtkPaned" id="paned36">
-            <property name="shrink-child2">False</property>
-            <property name="resize-child2">True</property>
-            <property name="shrink-child1">False</property>
-            <property name="resize-child1">False</property>
+            <property name="shrink-child2">0</property>
+            <property name="shrink-child1">0</property>
+            <property name="resize-child1">0</property>
             <property name="can_focus">1</property>
             <child>
               <object class="GtkPaned" id="required36">
-                <property name="shrink-child2">False</property>
-                <property name="resize-child2">True</property>
-                <property name="shrink-child1">False</property>
-                <property name="resize-child1">False</property>
+                <property name="shrink-child2">0</property>
+                <property name="shrink-child1">0</property>
+                <property name="resize-child1">0</property>
                 <property name="can_focus">1</property>
                 <property name="orientation">vertical</property>
                 <child>
@@ -4280,10 +4174,9 @@ ABCD</property>
             </child>
             <child>
               <object class="GtkPaned" id="natural36">
-                <property name="shrink-child2">False</property>
-                <property name="resize-child2">True</property>
-                <property name="shrink-child1">False</property>
-                <property name="resize-child1">False</property>
+                <property name="shrink-child2">0</property>
+                <property name="shrink-child1">0</property>
+                <property name="resize-child1">0</property>
                 <property name="can_focus">1</property>
                 <property name="orientation">vertical</property>
                 <child>
@@ -4312,61 +4205,59 @@ ABCD</property>
                 </child>
               </object>
             </child>
+            <layout>
+              <property name="left_attach">4</property>
+              <property name="top_attach">36</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">4</property>
-            <property name="top_attach">36</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="wrap37">
             <property name="label" translatable="yes">False</property>
+            <layout>
+              <property name="left_attach">0</property>
+              <property name="top_attach">37</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">0</property>
-            <property name="top_attach">37</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="ellipsize37">
             <property name="label" translatable="yes">none</property>
+            <layout>
+              <property name="left_attach">1</property>
+              <property name="top_attach">37</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">1</property>
-            <property name="top_attach">37</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="width_chars37">
             <property name="label" translatable="yes">4</property>
+            <layout>
+              <property name="left_attach">2</property>
+              <property name="top_attach">37</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">2</property>
-            <property name="top_attach">37</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="max_width_chars37">
             <property name="label" translatable="yes">8</property>
+            <layout>
+              <property name="left_attach">3</property>
+              <property name="top_attach">37</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">3</property>
-            <property name="top_attach">37</property>
-          </packing>
         </child>
         <child>
           <object class="GtkPaned" id="paned37">
-            <property name="shrink-child2">False</property>
-            <property name="resize-child2">True</property>
-            <property name="shrink-child1">False</property>
-            <property name="resize-child1">False</property>
+            <property name="shrink-child2">0</property>
+            <property name="shrink-child1">0</property>
+            <property name="resize-child1">0</property>
             <property name="can_focus">1</property>
             <child>
               <object class="GtkPaned" id="required37">
-                <property name="shrink-child2">False</property>
-                <property name="resize-child2">True</property>
-                <property name="shrink-child1">False</property>
-                <property name="resize-child1">False</property>
+                <property name="shrink-child2">0</property>
+                <property name="shrink-child1">0</property>
+                <property name="resize-child1">0</property>
                 <property name="can_focus">1</property>
                 <property name="orientation">vertical</property>
                 <child>
@@ -4399,10 +4290,9 @@ ABCD</property>
             </child>
             <child>
               <object class="GtkPaned" id="natural37">
-                <property name="shrink-child2">False</property>
-                <property name="resize-child2">True</property>
-                <property name="shrink-child1">False</property>
-                <property name="resize-child1">False</property>
+                <property name="shrink-child2">0</property>
+                <property name="shrink-child1">0</property>
+                <property name="resize-child1">0</property>
                 <property name="can_focus">1</property>
                 <property name="orientation">vertical</property>
                 <child>
@@ -4433,61 +4323,59 @@ ABCD</property>
                 </child>
               </object>
             </child>
+            <layout>
+              <property name="left_attach">4</property>
+              <property name="top_attach">37</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">4</property>
-            <property name="top_attach">37</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="wrap38">
             <property name="label" translatable="yes">True</property>
+            <layout>
+              <property name="left_attach">0</property>
+              <property name="top_attach">38</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">0</property>
-            <property name="top_attach">38</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="ellipsize38">
             <property name="label" translatable="yes">none</property>
+            <layout>
+              <property name="left_attach">1</property>
+              <property name="top_attach">38</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">1</property>
-            <property name="top_attach">38</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="width_chars38">
             <property name="label" translatable="yes">4</property>
+            <layout>
+              <property name="left_attach">2</property>
+              <property name="top_attach">38</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">2</property>
-            <property name="top_attach">38</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="max_width_chars38">
             <property name="label" translatable="yes">8</property>
+            <layout>
+              <property name="left_attach">3</property>
+              <property name="top_attach">38</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">3</property>
-            <property name="top_attach">38</property>
-          </packing>
         </child>
         <child>
           <object class="GtkPaned" id="paned38">
-            <property name="shrink-child2">False</property>
-            <property name="resize-child2">True</property>
-            <property name="shrink-child1">False</property>
-            <property name="resize-child1">False</property>
+            <property name="shrink-child2">0</property>
+            <property name="shrink-child1">0</property>
+            <property name="resize-child1">0</property>
             <property name="can_focus">1</property>
             <child>
               <object class="GtkPaned" id="required38">
-                <property name="shrink-child2">False</property>
-                <property name="resize-child2">True</property>
-                <property name="shrink-child1">False</property>
-                <property name="resize-child1">False</property>
+                <property name="shrink-child2">0</property>
+                <property name="shrink-child1">0</property>
+                <property name="resize-child1">0</property>
                 <property name="can_focus">1</property>
                 <property name="orientation">vertical</property>
                 <child>
@@ -4522,10 +4410,9 @@ ABCD</property>
             </child>
             <child>
               <object class="GtkPaned" id="natural38">
-                <property name="shrink-child2">False</property>
-                <property name="resize-child2">True</property>
-                <property name="shrink-child1">False</property>
-                <property name="resize-child1">False</property>
+                <property name="shrink-child2">0</property>
+                <property name="shrink-child1">0</property>
+                <property name="resize-child1">0</property>
                 <property name="can_focus">1</property>
                 <property name="orientation">vertical</property>
                 <child>
@@ -4558,61 +4445,59 @@ ABCD</property>
                 </child>
               </object>
             </child>
+            <layout>
+              <property name="left_attach">4</property>
+              <property name="top_attach">38</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">4</property>
-            <property name="top_attach">38</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="wrap39">
             <property name="label" translatable="yes">False</property>
+            <layout>
+              <property name="left_attach">0</property>
+              <property name="top_attach">39</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">0</property>
-            <property name="top_attach">39</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="ellipsize39">
             <property name="label" translatable="yes">end</property>
+            <layout>
+              <property name="left_attach">1</property>
+              <property name="top_attach">39</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">1</property>
-            <property name="top_attach">39</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="width_chars39">
             <property name="label" translatable="yes">4</property>
+            <layout>
+              <property name="left_attach">2</property>
+              <property name="top_attach">39</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">2</property>
-            <property name="top_attach">39</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="max_width_chars39">
             <property name="label" translatable="yes">8</property>
+            <layout>
+              <property name="left_attach">3</property>
+              <property name="top_attach">39</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">3</property>
-            <property name="top_attach">39</property>
-          </packing>
         </child>
         <child>
           <object class="GtkPaned" id="paned39">
-            <property name="shrink-child2">False</property>
-            <property name="resize-child2">True</property>
-            <property name="shrink-child1">False</property>
-            <property name="resize-child1">False</property>
+            <property name="shrink-child2">0</property>
+            <property name="shrink-child1">0</property>
+            <property name="resize-child1">0</property>
             <property name="can_focus">1</property>
             <child>
               <object class="GtkPaned" id="required39">
-                <property name="shrink-child2">False</property>
-                <property name="resize-child2">True</property>
-                <property name="shrink-child1">False</property>
-                <property name="resize-child1">False</property>
+                <property name="shrink-child2">0</property>
+                <property name="shrink-child1">0</property>
+                <property name="resize-child1">0</property>
                 <property name="can_focus">1</property>
                 <property name="orientation">vertical</property>
                 <child>
@@ -4645,10 +4530,9 @@ ABCD</property>
             </child>
             <child>
               <object class="GtkPaned" id="natural39">
-                <property name="shrink-child2">False</property>
-                <property name="resize-child2">True</property>
-                <property name="shrink-child1">False</property>
-                <property name="resize-child1">False</property>
+                <property name="shrink-child2">0</property>
+                <property name="shrink-child1">0</property>
+                <property name="resize-child1">0</property>
                 <property name="can_focus">1</property>
                 <property name="orientation">vertical</property>
                 <child>
@@ -4679,61 +4563,59 @@ ABCD</property>
                 </child>
               </object>
             </child>
+            <layout>
+              <property name="left_attach">4</property>
+              <property name="top_attach">39</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">4</property>
-            <property name="top_attach">39</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="wrap40">
             <property name="label" translatable="yes">True</property>
+            <layout>
+              <property name="left_attach">0</property>
+              <property name="top_attach">40</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">0</property>
-            <property name="top_attach">40</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="ellipsize40">
             <property name="label" translatable="yes">end</property>
+            <layout>
+              <property name="left_attach">1</property>
+              <property name="top_attach">40</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">1</property>
-            <property name="top_attach">40</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="width_chars40">
             <property name="label" translatable="yes">4</property>
+            <layout>
+              <property name="left_attach">2</property>
+              <property name="top_attach">40</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">2</property>
-            <property name="top_attach">40</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="max_width_chars40">
             <property name="label" translatable="yes">8</property>
+            <layout>
+              <property name="left_attach">3</property>
+              <property name="top_attach">40</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">3</property>
-            <property name="top_attach">40</property>
-          </packing>
         </child>
         <child>
           <object class="GtkPaned" id="paned40">
-            <property name="shrink-child2">False</property>
-            <property name="resize-child2">True</property>
-            <property name="shrink-child1">False</property>
-            <property name="resize-child1">False</property>
+            <property name="shrink-child2">0</property>
+            <property name="shrink-child1">0</property>
+            <property name="resize-child1">0</property>
             <property name="can_focus">1</property>
             <child>
               <object class="GtkPaned" id="required40">
-                <property name="shrink-child2">False</property>
-                <property name="resize-child2">True</property>
-                <property name="shrink-child1">False</property>
-                <property name="resize-child1">False</property>
+                <property name="shrink-child2">0</property>
+                <property name="shrink-child1">0</property>
+                <property name="resize-child1">0</property>
                 <property name="can_focus">1</property>
                 <property name="orientation">vertical</property>
                 <child>
@@ -4766,10 +4648,9 @@ ABCD</property>
             </child>
             <child>
               <object class="GtkPaned" id="natural40">
-                <property name="shrink-child2">False</property>
-                <property name="resize-child2">True</property>
-                <property name="shrink-child1">False</property>
-                <property name="resize-child1">False</property>
+                <property name="shrink-child2">0</property>
+                <property name="shrink-child1">0</property>
+                <property name="resize-child1">0</property>
                 <property name="can_focus">1</property>
                 <property name="orientation">vertical</property>
                 <child>
@@ -4800,61 +4681,59 @@ ABCD</property>
                 </child>
               </object>
             </child>
+            <layout>
+              <property name="left_attach">4</property>
+              <property name="top_attach">40</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">4</property>
-            <property name="top_attach">40</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="wrap41">
             <property name="label" translatable="yes">False</property>
+            <layout>
+              <property name="left_attach">0</property>
+              <property name="top_attach">41</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">0</property>
-            <property name="top_attach">41</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="ellipsize41">
             <property name="label" translatable="yes">none</property>
+            <layout>
+              <property name="left_attach">1</property>
+              <property name="top_attach">41</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">1</property>
-            <property name="top_attach">41</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="width_chars41">
             <property name="label" translatable="yes">8</property>
+            <layout>
+              <property name="left_attach">2</property>
+              <property name="top_attach">41</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">2</property>
-            <property name="top_attach">41</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="max_width_chars41">
             <property name="label" translatable="yes">8</property>
+            <layout>
+              <property name="left_attach">3</property>
+              <property name="top_attach">41</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">3</property>
-            <property name="top_attach">41</property>
-          </packing>
         </child>
         <child>
           <object class="GtkPaned" id="paned41">
-            <property name="shrink-child2">False</property>
-            <property name="resize-child2">True</property>
-            <property name="shrink-child1">False</property>
-            <property name="resize-child1">False</property>
+            <property name="shrink-child2">0</property>
+            <property name="shrink-child1">0</property>
+            <property name="resize-child1">0</property>
             <property name="can_focus">1</property>
             <child>
               <object class="GtkPaned" id="required41">
-                <property name="shrink-child2">False</property>
-                <property name="resize-child2">True</property>
-                <property name="shrink-child1">False</property>
-                <property name="resize-child1">False</property>
+                <property name="shrink-child2">0</property>
+                <property name="shrink-child1">0</property>
+                <property name="resize-child1">0</property>
                 <property name="can_focus">1</property>
                 <property name="orientation">vertical</property>
                 <child>
@@ -4887,10 +4766,9 @@ ABCD</property>
             </child>
             <child>
               <object class="GtkPaned" id="natural41">
-                <property name="shrink-child2">False</property>
-                <property name="resize-child2">True</property>
-                <property name="shrink-child1">False</property>
-                <property name="resize-child1">False</property>
+                <property name="shrink-child2">0</property>
+                <property name="shrink-child1">0</property>
+                <property name="resize-child1">0</property>
                 <property name="can_focus">1</property>
                 <property name="orientation">vertical</property>
                 <child>
@@ -4921,61 +4799,59 @@ ABCD</property>
                 </child>
               </object>
             </child>
+            <layout>
+              <property name="left_attach">4</property>
+              <property name="top_attach">41</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">4</property>
-            <property name="top_attach">41</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="wrap42">
             <property name="label" translatable="yes">True</property>
+            <layout>
+              <property name="left_attach">0</property>
+              <property name="top_attach">42</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">0</property>
-            <property name="top_attach">42</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="ellipsize42">
             <property name="label" translatable="yes">none</property>
+            <layout>
+              <property name="left_attach">1</property>
+              <property name="top_attach">42</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">1</property>
-            <property name="top_attach">42</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="width_chars42">
             <property name="label" translatable="yes">8</property>
+            <layout>
+              <property name="left_attach">2</property>
+              <property name="top_attach">42</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">2</property>
-            <property name="top_attach">42</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="max_width_chars42">
             <property name="label" translatable="yes">8</property>
+            <layout>
+              <property name="left_attach">3</property>
+              <property name="top_attach">42</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">3</property>
-            <property name="top_attach">42</property>
-          </packing>
         </child>
         <child>
           <object class="GtkPaned" id="paned42">
-            <property name="shrink-child2">False</property>
-            <property name="resize-child2">True</property>
-            <property name="shrink-child1">False</property>
-            <property name="resize-child1">False</property>
+            <property name="shrink-child2">0</property>
+            <property name="shrink-child1">0</property>
+            <property name="resize-child1">0</property>
             <property name="can_focus">1</property>
             <child>
               <object class="GtkPaned" id="required42">
-                <property name="shrink-child2">False</property>
-                <property name="resize-child2">True</property>
-                <property name="shrink-child1">False</property>
-                <property name="resize-child1">False</property>
+                <property name="shrink-child2">0</property>
+                <property name="shrink-child1">0</property>
+                <property name="resize-child1">0</property>
                 <property name="can_focus">1</property>
                 <property name="orientation">vertical</property>
                 <child>
@@ -5010,10 +4886,9 @@ ABCD</property>
             </child>
             <child>
               <object class="GtkPaned" id="natural42">
-                <property name="shrink-child2">False</property>
-                <property name="resize-child2">True</property>
-                <property name="shrink-child1">False</property>
-                <property name="resize-child1">False</property>
+                <property name="shrink-child2">0</property>
+                <property name="shrink-child1">0</property>
+                <property name="resize-child1">0</property>
                 <property name="can_focus">1</property>
                 <property name="orientation">vertical</property>
                 <child>
@@ -5046,61 +4921,59 @@ ABCD</property>
                 </child>
               </object>
             </child>
+            <layout>
+              <property name="left_attach">4</property>
+              <property name="top_attach">42</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">4</property>
-            <property name="top_attach">42</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="wrap43">
             <property name="label" translatable="yes">False</property>
+            <layout>
+              <property name="left_attach">0</property>
+              <property name="top_attach">43</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">0</property>
-            <property name="top_attach">43</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="ellipsize43">
             <property name="label" translatable="yes">end</property>
+            <layout>
+              <property name="left_attach">1</property>
+              <property name="top_attach">43</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">1</property>
-            <property name="top_attach">43</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="width_chars43">
             <property name="label" translatable="yes">8</property>
+            <layout>
+              <property name="left_attach">2</property>
+              <property name="top_attach">43</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">2</property>
-            <property name="top_attach">43</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="max_width_chars43">
             <property name="label" translatable="yes">8</property>
+            <layout>
+              <property name="left_attach">3</property>
+              <property name="top_attach">43</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">3</property>
-            <property name="top_attach">43</property>
-          </packing>
         </child>
         <child>
           <object class="GtkPaned" id="paned43">
-            <property name="shrink-child2">False</property>
-            <property name="resize-child2">True</property>
-            <property name="shrink-child1">False</property>
-            <property name="resize-child1">False</property>
+            <property name="shrink-child2">0</property>
+            <property name="shrink-child1">0</property>
+            <property name="resize-child1">0</property>
             <property name="can_focus">1</property>
             <child>
               <object class="GtkPaned" id="required43">
-                <property name="shrink-child2">False</property>
-                <property name="resize-child2">True</property>
-                <property name="shrink-child1">False</property>
-                <property name="resize-child1">False</property>
+                <property name="shrink-child2">0</property>
+                <property name="shrink-child1">0</property>
+                <property name="resize-child1">0</property>
                 <property name="can_focus">1</property>
                 <property name="orientation">vertical</property>
                 <child>
@@ -5133,10 +5006,9 @@ ABCD</property>
             </child>
             <child>
               <object class="GtkPaned" id="natural43">
-                <property name="shrink-child2">False</property>
-                <property name="resize-child2">True</property>
-                <property name="shrink-child1">False</property>
-                <property name="resize-child1">False</property>
+                <property name="shrink-child2">0</property>
+                <property name="shrink-child1">0</property>
+                <property name="resize-child1">0</property>
                 <property name="can_focus">1</property>
                 <property name="orientation">vertical</property>
                 <child>
@@ -5167,61 +5039,59 @@ ABCD</property>
                 </child>
               </object>
             </child>
+            <layout>
+              <property name="left_attach">4</property>
+              <property name="top_attach">43</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">4</property>
-            <property name="top_attach">43</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="wrap44">
             <property name="label" translatable="yes">True</property>
+            <layout>
+              <property name="left_attach">0</property>
+              <property name="top_attach">44</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">0</property>
-            <property name="top_attach">44</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="ellipsize44">
             <property name="label" translatable="yes">end</property>
+            <layout>
+              <property name="left_attach">1</property>
+              <property name="top_attach">44</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">1</property>
-            <property name="top_attach">44</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="width_chars44">
             <property name="label" translatable="yes">8</property>
+            <layout>
+              <property name="left_attach">2</property>
+              <property name="top_attach">44</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">2</property>
-            <property name="top_attach">44</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="max_width_chars44">
             <property name="label" translatable="yes">8</property>
+            <layout>
+              <property name="left_attach">3</property>
+              <property name="top_attach">44</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">3</property>
-            <property name="top_attach">44</property>
-          </packing>
         </child>
         <child>
           <object class="GtkPaned" id="paned44">
-            <property name="shrink-child2">False</property>
-            <property name="resize-child2">True</property>
-            <property name="shrink-child1">False</property>
-            <property name="resize-child1">False</property>
+            <property name="shrink-child2">0</property>
+            <property name="shrink-child1">0</property>
+            <property name="resize-child1">0</property>
             <property name="can_focus">1</property>
             <child>
               <object class="GtkPaned" id="required44">
-                <property name="shrink-child2">False</property>
-                <property name="resize-child2">True</property>
-                <property name="shrink-child1">False</property>
-                <property name="resize-child1">False</property>
+                <property name="shrink-child2">0</property>
+                <property name="shrink-child1">0</property>
+                <property name="resize-child1">0</property>
                 <property name="can_focus">1</property>
                 <property name="orientation">vertical</property>
                 <child>
@@ -5254,10 +5124,9 @@ ABCD</property>
             </child>
             <child>
               <object class="GtkPaned" id="natural44">
-                <property name="shrink-child2">False</property>
-                <property name="resize-child2">True</property>
-                <property name="shrink-child1">False</property>
-                <property name="resize-child1">False</property>
+                <property name="shrink-child2">0</property>
+                <property name="shrink-child1">0</property>
+                <property name="resize-child1">0</property>
                 <property name="can_focus">1</property>
                 <property name="orientation">vertical</property>
                 <child>
@@ -5288,61 +5157,59 @@ ABCD</property>
                 </child>
               </object>
             </child>
+            <layout>
+              <property name="left_attach">4</property>
+              <property name="top_attach">44</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">4</property>
-            <property name="top_attach">44</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="wrap45">
             <property name="label" translatable="yes">False</property>
+            <layout>
+              <property name="left_attach">0</property>
+              <property name="top_attach">45</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">0</property>
-            <property name="top_attach">45</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="ellipsize45">
             <property name="label" translatable="yes">none</property>
+            <layout>
+              <property name="left_attach">1</property>
+              <property name="top_attach">45</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">1</property>
-            <property name="top_attach">45</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="width_chars45">
             <property name="label" translatable="yes">12</property>
+            <layout>
+              <property name="left_attach">2</property>
+              <property name="top_attach">45</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">2</property>
-            <property name="top_attach">45</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="max_width_chars45">
             <property name="label" translatable="yes">8</property>
+            <layout>
+              <property name="left_attach">3</property>
+              <property name="top_attach">45</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">3</property>
-            <property name="top_attach">45</property>
-          </packing>
         </child>
         <child>
           <object class="GtkPaned" id="paned45">
-            <property name="shrink-child2">False</property>
-            <property name="resize-child2">True</property>
-            <property name="shrink-child1">False</property>
-            <property name="resize-child1">False</property>
+            <property name="shrink-child2">0</property>
+            <property name="shrink-child1">0</property>
+            <property name="resize-child1">0</property>
             <property name="can_focus">1</property>
             <child>
               <object class="GtkPaned" id="required45">
-                <property name="shrink-child2">False</property>
-                <property name="resize-child2">True</property>
-                <property name="shrink-child1">False</property>
-                <property name="resize-child1">False</property>
+                <property name="shrink-child2">0</property>
+                <property name="shrink-child1">0</property>
+                <property name="resize-child1">0</property>
                 <property name="can_focus">1</property>
                 <property name="orientation">vertical</property>
                 <child>
@@ -5375,10 +5242,9 @@ ABCD</property>
             </child>
             <child>
               <object class="GtkPaned" id="natural45">
-                <property name="shrink-child2">False</property>
-                <property name="resize-child2">True</property>
-                <property name="shrink-child1">False</property>
-                <property name="resize-child1">False</property>
+                <property name="shrink-child2">0</property>
+                <property name="shrink-child1">0</property>
+                <property name="resize-child1">0</property>
                 <property name="can_focus">1</property>
                 <property name="orientation">vertical</property>
                 <child>
@@ -5409,61 +5275,59 @@ ABCD</property>
                 </child>
               </object>
             </child>
+            <layout>
+              <property name="left_attach">4</property>
+              <property name="top_attach">45</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">4</property>
-            <property name="top_attach">45</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="wrap46">
             <property name="label" translatable="yes">True</property>
+            <layout>
+              <property name="left_attach">0</property>
+              <property name="top_attach">46</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">0</property>
-            <property name="top_attach">46</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="ellipsize46">
             <property name="label" translatable="yes">none</property>
+            <layout>
+              <property name="left_attach">1</property>
+              <property name="top_attach">46</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">1</property>
-            <property name="top_attach">46</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="width_chars46">
             <property name="label" translatable="yes">12</property>
+            <layout>
+              <property name="left_attach">2</property>
+              <property name="top_attach">46</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">2</property>
-            <property name="top_attach">46</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="max_width_chars46">
             <property name="label" translatable="yes">8</property>
+            <layout>
+              <property name="left_attach">3</property>
+              <property name="top_attach">46</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">3</property>
-            <property name="top_attach">46</property>
-          </packing>
         </child>
         <child>
           <object class="GtkPaned" id="paned46">
-            <property name="shrink-child2">False</property>
-            <property name="resize-child2">True</property>
-            <property name="shrink-child1">False</property>
-            <property name="resize-child1">False</property>
+            <property name="shrink-child2">0</property>
+            <property name="shrink-child1">0</property>
+            <property name="resize-child1">0</property>
             <property name="can_focus">1</property>
             <child>
               <object class="GtkPaned" id="required46">
-                <property name="shrink-child2">False</property>
-                <property name="resize-child2">True</property>
-                <property name="shrink-child1">False</property>
-                <property name="resize-child1">False</property>
+                <property name="shrink-child2">0</property>
+                <property name="shrink-child1">0</property>
+                <property name="resize-child1">0</property>
                 <property name="can_focus">1</property>
                 <property name="orientation">vertical</property>
                 <child>
@@ -5496,10 +5360,9 @@ ABCD</property>
             </child>
             <child>
               <object class="GtkPaned" id="natural46">
-                <property name="shrink-child2">False</property>
-                <property name="resize-child2">True</property>
-                <property name="shrink-child1">False</property>
-                <property name="resize-child1">False</property>
+                <property name="shrink-child2">0</property>
+                <property name="shrink-child1">0</property>
+                <property name="resize-child1">0</property>
                 <property name="can_focus">1</property>
                 <property name="orientation">vertical</property>
                 <child>
@@ -5530,61 +5393,59 @@ ABCD</property>
                 </child>
               </object>
             </child>
+            <layout>
+              <property name="left_attach">4</property>
+              <property name="top_attach">46</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">4</property>
-            <property name="top_attach">46</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="wrap47">
             <property name="label" translatable="yes">False</property>
+            <layout>
+              <property name="left_attach">0</property>
+              <property name="top_attach">47</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">0</property>
-            <property name="top_attach">47</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="ellipsize47">
             <property name="label" translatable="yes">end</property>
+            <layout>
+              <property name="left_attach">1</property>
+              <property name="top_attach">47</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">1</property>
-            <property name="top_attach">47</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="width_chars47">
             <property name="label" translatable="yes">12</property>
+            <layout>
+              <property name="left_attach">2</property>
+              <property name="top_attach">47</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">2</property>
-            <property name="top_attach">47</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="max_width_chars47">
             <property name="label" translatable="yes">8</property>
+            <layout>
+              <property name="left_attach">3</property>
+              <property name="top_attach">47</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">3</property>
-            <property name="top_attach">47</property>
-          </packing>
         </child>
         <child>
           <object class="GtkPaned" id="paned47">
-            <property name="shrink-child2">False</property>
-            <property name="resize-child2">True</property>
-            <property name="shrink-child1">False</property>
-            <property name="resize-child1">False</property>
+            <property name="shrink-child2">0</property>
+            <property name="shrink-child1">0</property>
+            <property name="resize-child1">0</property>
             <property name="can_focus">1</property>
             <child>
               <object class="GtkPaned" id="required47">
-                <property name="shrink-child2">False</property>
-                <property name="resize-child2">True</property>
-                <property name="shrink-child1">False</property>
-                <property name="resize-child1">False</property>
+                <property name="shrink-child2">0</property>
+                <property name="shrink-child1">0</property>
+                <property name="resize-child1">0</property>
                 <property name="can_focus">1</property>
                 <property name="orientation">vertical</property>
                 <child>
@@ -5617,10 +5478,9 @@ ABCD</property>
             </child>
             <child>
               <object class="GtkPaned" id="natural47">
-                <property name="shrink-child2">False</property>
-                <property name="resize-child2">True</property>
-                <property name="shrink-child1">False</property>
-                <property name="resize-child1">False</property>
+                <property name="shrink-child2">0</property>
+                <property name="shrink-child1">0</property>
+                <property name="resize-child1">0</property>
                 <property name="can_focus">1</property>
                 <property name="orientation">vertical</property>
                 <child>
@@ -5651,61 +5511,59 @@ ABCD</property>
                 </child>
               </object>
             </child>
+            <layout>
+              <property name="left_attach">4</property>
+              <property name="top_attach">47</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">4</property>
-            <property name="top_attach">47</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="wrap48">
             <property name="label" translatable="yes">True</property>
+            <layout>
+              <property name="left_attach">0</property>
+              <property name="top_attach">48</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">0</property>
-            <property name="top_attach">48</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="ellipsize48">
             <property name="label" translatable="yes">end</property>
+            <layout>
+              <property name="left_attach">1</property>
+              <property name="top_attach">48</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">1</property>
-            <property name="top_attach">48</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="width_chars48">
             <property name="label" translatable="yes">12</property>
+            <layout>
+              <property name="left_attach">2</property>
+              <property name="top_attach">48</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">2</property>
-            <property name="top_attach">48</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="max_width_chars48">
             <property name="label" translatable="yes">8</property>
+            <layout>
+              <property name="left_attach">3</property>
+              <property name="top_attach">48</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">3</property>
-            <property name="top_attach">48</property>
-          </packing>
         </child>
         <child>
           <object class="GtkPaned" id="paned48">
-            <property name="shrink-child2">False</property>
-            <property name="resize-child2">True</property>
-            <property name="shrink-child1">False</property>
-            <property name="resize-child1">False</property>
+            <property name="shrink-child2">0</property>
+            <property name="shrink-child1">0</property>
+            <property name="resize-child1">0</property>
             <property name="can_focus">1</property>
             <child>
               <object class="GtkPaned" id="required48">
-                <property name="shrink-child2">False</property>
-                <property name="resize-child2">True</property>
-                <property name="shrink-child1">False</property>
-                <property name="resize-child1">False</property>
+                <property name="shrink-child2">0</property>
+                <property name="shrink-child1">0</property>
+                <property name="resize-child1">0</property>
                 <property name="can_focus">1</property>
                 <property name="orientation">vertical</property>
                 <child>
@@ -5738,10 +5596,9 @@ ABCD</property>
             </child>
             <child>
               <object class="GtkPaned" id="natural48">
-                <property name="shrink-child2">False</property>
-                <property name="resize-child2">True</property>
-                <property name="shrink-child1">False</property>
-                <property name="resize-child1">False</property>
+                <property name="shrink-child2">0</property>
+                <property name="shrink-child1">0</property>
+                <property name="resize-child1">0</property>
                 <property name="can_focus">1</property>
                 <property name="orientation">vertical</property>
                 <child>
@@ -5772,61 +5629,59 @@ ABCD</property>
                 </child>
               </object>
             </child>
+            <layout>
+              <property name="left_attach">4</property>
+              <property name="top_attach">48</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">4</property>
-            <property name="top_attach">48</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="wrap49">
             <property name="label" translatable="yes">False</property>
+            <layout>
+              <property name="left_attach">0</property>
+              <property name="top_attach">49</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">0</property>
-            <property name="top_attach">49</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="ellipsize49">
             <property name="label" translatable="yes">none</property>
+            <layout>
+              <property name="left_attach">1</property>
+              <property name="top_attach">49</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">1</property>
-            <property name="top_attach">49</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="width_chars49">
             <property name="label" translatable="yes">-1</property>
+            <layout>
+              <property name="left_attach">2</property>
+              <property name="top_attach">49</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">2</property>
-            <property name="top_attach">49</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="max_width_chars49">
             <property name="label" translatable="yes">12</property>
+            <layout>
+              <property name="left_attach">3</property>
+              <property name="top_attach">49</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">3</property>
-            <property name="top_attach">49</property>
-          </packing>
         </child>
         <child>
           <object class="GtkPaned" id="paned49">
-            <property name="shrink-child2">False</property>
-            <property name="resize-child2">True</property>
-            <property name="shrink-child1">False</property>
-            <property name="resize-child1">False</property>
+            <property name="shrink-child2">0</property>
+            <property name="shrink-child1">0</property>
+            <property name="resize-child1">0</property>
             <property name="can_focus">1</property>
             <child>
               <object class="GtkPaned" id="required49">
-                <property name="shrink-child2">False</property>
-                <property name="resize-child2">True</property>
-                <property name="shrink-child1">False</property>
-                <property name="resize-child1">False</property>
+                <property name="shrink-child2">0</property>
+                <property name="shrink-child1">0</property>
+                <property name="resize-child1">0</property>
                 <property name="can_focus">1</property>
                 <property name="orientation">vertical</property>
                 <child>
@@ -5857,10 +5712,9 @@ ABCD</property>
             </child>
             <child>
               <object class="GtkPaned" id="natural49">
-                <property name="shrink-child2">False</property>
-                <property name="resize-child2">True</property>
-                <property name="shrink-child1">False</property>
-                <property name="resize-child1">False</property>
+                <property name="shrink-child2">0</property>
+                <property name="shrink-child1">0</property>
+                <property name="resize-child1">0</property>
                 <property name="can_focus">1</property>
                 <property name="orientation">vertical</property>
                 <child>
@@ -5889,61 +5743,59 @@ ABCD</property>
                 </child>
               </object>
             </child>
+            <layout>
+              <property name="left_attach">4</property>
+              <property name="top_attach">49</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">4</property>
-            <property name="top_attach">49</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="wrap50">
             <property name="label" translatable="yes">True</property>
+            <layout>
+              <property name="left_attach">0</property>
+              <property name="top_attach">50</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">0</property>
-            <property name="top_attach">50</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="ellipsize50">
             <property name="label" translatable="yes">none</property>
+            <layout>
+              <property name="left_attach">1</property>
+              <property name="top_attach">50</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">1</property>
-            <property name="top_attach">50</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="width_chars50">
             <property name="label" translatable="yes">-1</property>
+            <layout>
+              <property name="left_attach">2</property>
+              <property name="top_attach">50</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">2</property>
-            <property name="top_attach">50</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="max_width_chars50">
             <property name="label" translatable="yes">12</property>
+            <layout>
+              <property name="left_attach">3</property>
+              <property name="top_attach">50</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">3</property>
-            <property name="top_attach">50</property>
-          </packing>
         </child>
         <child>
           <object class="GtkPaned" id="paned50">
-            <property name="shrink-child2">False</property>
-            <property name="resize-child2">True</property>
-            <property name="shrink-child1">False</property>
-            <property name="resize-child1">False</property>
+            <property name="shrink-child2">0</property>
+            <property name="shrink-child1">0</property>
+            <property name="resize-child1">0</property>
             <property name="can_focus">1</property>
             <child>
               <object class="GtkPaned" id="required50">
-                <property name="shrink-child2">False</property>
-                <property name="resize-child2">True</property>
-                <property name="shrink-child1">False</property>
-                <property name="resize-child1">False</property>
+                <property name="shrink-child2">0</property>
+                <property name="shrink-child1">0</property>
+                <property name="resize-child1">0</property>
                 <property name="can_focus">1</property>
                 <property name="orientation">vertical</property>
                 <child>
@@ -5976,10 +5828,9 @@ ABCD</property>
             </child>
             <child>
               <object class="GtkPaned" id="natural50">
-                <property name="shrink-child2">False</property>
-                <property name="resize-child2">True</property>
-                <property name="shrink-child1">False</property>
-                <property name="resize-child1">False</property>
+                <property name="shrink-child2">0</property>
+                <property name="shrink-child1">0</property>
+                <property name="resize-child1">0</property>
                 <property name="can_focus">1</property>
                 <property name="orientation">vertical</property>
                 <child>
@@ -6008,61 +5859,59 @@ ABCD</property>
                 </child>
               </object>
             </child>
+            <layout>
+              <property name="left_attach">4</property>
+              <property name="top_attach">50</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">4</property>
-            <property name="top_attach">50</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="wrap51">
             <property name="label" translatable="yes">False</property>
+            <layout>
+              <property name="left_attach">0</property>
+              <property name="top_attach">51</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">0</property>
-            <property name="top_attach">51</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="ellipsize51">
             <property name="label" translatable="yes">end</property>
+            <layout>
+              <property name="left_attach">1</property>
+              <property name="top_attach">51</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">1</property>
-            <property name="top_attach">51</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="width_chars51">
             <property name="label" translatable="yes">-1</property>
+            <layout>
+              <property name="left_attach">2</property>
+              <property name="top_attach">51</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">2</property>
-            <property name="top_attach">51</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="max_width_chars51">
             <property name="label" translatable="yes">12</property>
+            <layout>
+              <property name="left_attach">3</property>
+              <property name="top_attach">51</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">3</property>
-            <property name="top_attach">51</property>
-          </packing>
         </child>
         <child>
           <object class="GtkPaned" id="paned51">
-            <property name="shrink-child2">False</property>
-            <property name="resize-child2">True</property>
-            <property name="shrink-child1">False</property>
-            <property name="resize-child1">False</property>
+            <property name="shrink-child2">0</property>
+            <property name="shrink-child1">0</property>
+            <property name="resize-child1">0</property>
             <property name="can_focus">1</property>
             <child>
               <object class="GtkPaned" id="required51">
-                <property name="shrink-child2">False</property>
-                <property name="resize-child2">True</property>
-                <property name="shrink-child1">False</property>
-                <property name="resize-child1">False</property>
+                <property name="shrink-child2">0</property>
+                <property name="shrink-child1">0</property>
+                <property name="resize-child1">0</property>
                 <property name="can_focus">1</property>
                 <property name="orientation">vertical</property>
                 <child>
@@ -6093,10 +5942,9 @@ ABCD</property>
             </child>
             <child>
               <object class="GtkPaned" id="natural51">
-                <property name="shrink-child2">False</property>
-                <property name="resize-child2">True</property>
-                <property name="shrink-child1">False</property>
-                <property name="resize-child1">False</property>
+                <property name="shrink-child2">0</property>
+                <property name="shrink-child1">0</property>
+                <property name="resize-child1">0</property>
                 <property name="can_focus">1</property>
                 <property name="orientation">vertical</property>
                 <child>
@@ -6125,61 +5973,59 @@ ABCD</property>
                 </child>
               </object>
             </child>
+            <layout>
+              <property name="left_attach">4</property>
+              <property name="top_attach">51</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">4</property>
-            <property name="top_attach">51</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="wrap52">
             <property name="label" translatable="yes">True</property>
+            <layout>
+              <property name="left_attach">0</property>
+              <property name="top_attach">52</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">0</property>
-            <property name="top_attach">52</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="ellipsize52">
             <property name="label" translatable="yes">end</property>
+            <layout>
+              <property name="left_attach">1</property>
+              <property name="top_attach">52</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">1</property>
-            <property name="top_attach">52</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="width_chars52">
             <property name="label" translatable="yes">-1</property>
+            <layout>
+              <property name="left_attach">2</property>
+              <property name="top_attach">52</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">2</property>
-            <property name="top_attach">52</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="max_width_chars52">
             <property name="label" translatable="yes">12</property>
+            <layout>
+              <property name="left_attach">3</property>
+              <property name="top_attach">52</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">3</property>
-            <property name="top_attach">52</property>
-          </packing>
         </child>
         <child>
           <object class="GtkPaned" id="paned52">
-            <property name="shrink-child2">False</property>
-            <property name="resize-child2">True</property>
-            <property name="shrink-child1">False</property>
-            <property name="resize-child1">False</property>
+            <property name="shrink-child2">0</property>
+            <property name="shrink-child1">0</property>
+            <property name="resize-child1">0</property>
             <property name="can_focus">1</property>
             <child>
               <object class="GtkPaned" id="required52">
-                <property name="shrink-child2">False</property>
-                <property name="resize-child2">True</property>
-                <property name="shrink-child1">False</property>
-                <property name="resize-child1">False</property>
+                <property name="shrink-child2">0</property>
+                <property name="shrink-child1">0</property>
+                <property name="resize-child1">0</property>
                 <property name="can_focus">1</property>
                 <property name="orientation">vertical</property>
                 <child>
@@ -6210,10 +6056,9 @@ ABCD</property>
             </child>
             <child>
               <object class="GtkPaned" id="natural52">
-                <property name="shrink-child2">False</property>
-                <property name="resize-child2">True</property>
-                <property name="shrink-child1">False</property>
-                <property name="resize-child1">False</property>
+                <property name="shrink-child2">0</property>
+                <property name="shrink-child1">0</property>
+                <property name="resize-child1">0</property>
                 <property name="can_focus">1</property>
                 <property name="orientation">vertical</property>
                 <child>
@@ -6242,61 +6087,59 @@ ABCD</property>
                 </child>
               </object>
             </child>
+            <layout>
+              <property name="left_attach">4</property>
+              <property name="top_attach">52</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">4</property>
-            <property name="top_attach">52</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="wrap53">
             <property name="label" translatable="yes">False</property>
+            <layout>
+              <property name="left_attach">0</property>
+              <property name="top_attach">53</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">0</property>
-            <property name="top_attach">53</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="ellipsize53">
             <property name="label" translatable="yes">none</property>
+            <layout>
+              <property name="left_attach">1</property>
+              <property name="top_attach">53</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">1</property>
-            <property name="top_attach">53</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="width_chars53">
             <property name="label" translatable="yes">4</property>
+            <layout>
+              <property name="left_attach">2</property>
+              <property name="top_attach">53</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">2</property>
-            <property name="top_attach">53</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="max_width_chars53">
             <property name="label" translatable="yes">12</property>
+            <layout>
+              <property name="left_attach">3</property>
+              <property name="top_attach">53</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">3</property>
-            <property name="top_attach">53</property>
-          </packing>
         </child>
         <child>
           <object class="GtkPaned" id="paned53">
-            <property name="shrink-child2">False</property>
-            <property name="resize-child2">True</property>
-            <property name="shrink-child1">False</property>
-            <property name="resize-child1">False</property>
+            <property name="shrink-child2">0</property>
+            <property name="shrink-child1">0</property>
+            <property name="resize-child1">0</property>
             <property name="can_focus">1</property>
             <child>
               <object class="GtkPaned" id="required53">
-                <property name="shrink-child2">False</property>
-                <property name="resize-child2">True</property>
-                <property name="shrink-child1">False</property>
-                <property name="resize-child1">False</property>
+                <property name="shrink-child2">0</property>
+                <property name="shrink-child1">0</property>
+                <property name="resize-child1">0</property>
                 <property name="can_focus">1</property>
                 <property name="orientation">vertical</property>
                 <child>
@@ -6329,10 +6172,9 @@ ABCD</property>
             </child>
             <child>
               <object class="GtkPaned" id="natural53">
-                <property name="shrink-child2">False</property>
-                <property name="resize-child2">True</property>
-                <property name="shrink-child1">False</property>
-                <property name="resize-child1">False</property>
+                <property name="shrink-child2">0</property>
+                <property name="shrink-child1">0</property>
+                <property name="resize-child1">0</property>
                 <property name="can_focus">1</property>
                 <property name="orientation">vertical</property>
                 <child>
@@ -6363,61 +6205,59 @@ ABCD</property>
                 </child>
               </object>
             </child>
+            <layout>
+              <property name="left_attach">4</property>
+              <property name="top_attach">53</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">4</property>
-            <property name="top_attach">53</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="wrap54">
             <property name="label" translatable="yes">True</property>
+            <layout>
+              <property name="left_attach">0</property>
+              <property name="top_attach">54</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">0</property>
-            <property name="top_attach">54</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="ellipsize54">
             <property name="label" translatable="yes">none</property>
+            <layout>
+              <property name="left_attach">1</property>
+              <property name="top_attach">54</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">1</property>
-            <property name="top_attach">54</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="width_chars54">
             <property name="label" translatable="yes">4</property>
+            <layout>
+              <property name="left_attach">2</property>
+              <property name="top_attach">54</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">2</property>
-            <property name="top_attach">54</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="max_width_chars54">
             <property name="label" translatable="yes">12</property>
+            <layout>
+              <property name="left_attach">3</property>
+              <property name="top_attach">54</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">3</property>
-            <property name="top_attach">54</property>
-          </packing>
         </child>
         <child>
           <object class="GtkPaned" id="paned54">
-            <property name="shrink-child2">False</property>
-            <property name="resize-child2">True</property>
-            <property name="shrink-child1">False</property>
-            <property name="resize-child1">False</property>
+            <property name="shrink-child2">0</property>
+            <property name="shrink-child1">0</property>
+            <property name="resize-child1">0</property>
             <property name="can_focus">1</property>
             <child>
               <object class="GtkPaned" id="required54">
-                <property name="shrink-child2">False</property>
-                <property name="resize-child2">True</property>
-                <property name="shrink-child1">False</property>
-                <property name="resize-child1">False</property>
+                <property name="shrink-child2">0</property>
+                <property name="shrink-child1">0</property>
+                <property name="resize-child1">0</property>
                 <property name="can_focus">1</property>
                 <property name="orientation">vertical</property>
                 <child>
@@ -6452,10 +6292,9 @@ ABCD</property>
             </child>
             <child>
               <object class="GtkPaned" id="natural54">
-                <property name="shrink-child2">False</property>
-                <property name="resize-child2">True</property>
-                <property name="shrink-child1">False</property>
-                <property name="resize-child1">False</property>
+                <property name="shrink-child2">0</property>
+                <property name="shrink-child1">0</property>
+                <property name="resize-child1">0</property>
                 <property name="can_focus">1</property>
                 <property name="orientation">vertical</property>
                 <child>
@@ -6486,61 +6325,59 @@ ABCD</property>
                 </child>
               </object>
             </child>
+            <layout>
+              <property name="left_attach">4</property>
+              <property name="top_attach">54</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">4</property>
-            <property name="top_attach">54</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="wrap55">
             <property name="label" translatable="yes">False</property>
+            <layout>
+              <property name="left_attach">0</property>
+              <property name="top_attach">55</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">0</property>
-            <property name="top_attach">55</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="ellipsize55">
             <property name="label" translatable="yes">end</property>
+            <layout>
+              <property name="left_attach">1</property>
+              <property name="top_attach">55</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">1</property>
-            <property name="top_attach">55</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="width_chars55">
             <property name="label" translatable="yes">4</property>
+            <layout>
+              <property name="left_attach">2</property>
+              <property name="top_attach">55</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">2</property>
-            <property name="top_attach">55</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="max_width_chars55">
             <property name="label" translatable="yes">12</property>
+            <layout>
+              <property name="left_attach">3</property>
+              <property name="top_attach">55</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">3</property>
-            <property name="top_attach">55</property>
-          </packing>
         </child>
         <child>
           <object class="GtkPaned" id="paned55">
-            <property name="shrink-child2">False</property>
-            <property name="resize-child2">True</property>
-            <property name="shrink-child1">False</property>
-            <property name="resize-child1">False</property>
+            <property name="shrink-child2">0</property>
+            <property name="shrink-child1">0</property>
+            <property name="resize-child1">0</property>
             <property name="can_focus">1</property>
             <child>
               <object class="GtkPaned" id="required55">
-                <property name="shrink-child2">False</property>
-                <property name="resize-child2">True</property>
-                <property name="shrink-child1">False</property>
-                <property name="resize-child1">False</property>
+                <property name="shrink-child2">0</property>
+                <property name="shrink-child1">0</property>
+                <property name="resize-child1">0</property>
                 <property name="can_focus">1</property>
                 <property name="orientation">vertical</property>
                 <child>
@@ -6573,10 +6410,9 @@ ABCD</property>
             </child>
             <child>
               <object class="GtkPaned" id="natural55">
-                <property name="shrink-child2">False</property>
-                <property name="resize-child2">True</property>
-                <property name="shrink-child1">False</property>
-                <property name="resize-child1">False</property>
+                <property name="shrink-child2">0</property>
+                <property name="shrink-child1">0</property>
+                <property name="resize-child1">0</property>
                 <property name="can_focus">1</property>
                 <property name="orientation">vertical</property>
                 <child>
@@ -6607,61 +6443,59 @@ ABCD</property>
                 </child>
               </object>
             </child>
+            <layout>
+              <property name="left_attach">4</property>
+              <property name="top_attach">55</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">4</property>
-            <property name="top_attach">55</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="wrap56">
             <property name="label" translatable="yes">True</property>
+            <layout>
+              <property name="left_attach">0</property>
+              <property name="top_attach">56</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">0</property>
-            <property name="top_attach">56</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="ellipsize56">
             <property name="label" translatable="yes">end</property>
+            <layout>
+              <property name="left_attach">1</property>
+              <property name="top_attach">56</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">1</property>
-            <property name="top_attach">56</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="width_chars56">
             <property name="label" translatable="yes">4</property>
+            <layout>
+              <property name="left_attach">2</property>
+              <property name="top_attach">56</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">2</property>
-            <property name="top_attach">56</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="max_width_chars56">
             <property name="label" translatable="yes">12</property>
+            <layout>
+              <property name="left_attach">3</property>
+              <property name="top_attach">56</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">3</property>
-            <property name="top_attach">56</property>
-          </packing>
         </child>
         <child>
           <object class="GtkPaned" id="paned56">
-            <property name="shrink-child2">False</property>
-            <property name="resize-child2">True</property>
-            <property name="shrink-child1">False</property>
-            <property name="resize-child1">False</property>
+            <property name="shrink-child2">0</property>
+            <property name="shrink-child1">0</property>
+            <property name="resize-child1">0</property>
             <property name="can_focus">1</property>
             <child>
               <object class="GtkPaned" id="required56">
-                <property name="shrink-child2">False</property>
-                <property name="resize-child2">True</property>
-                <property name="shrink-child1">False</property>
-                <property name="resize-child1">False</property>
+                <property name="shrink-child2">0</property>
+                <property name="shrink-child1">0</property>
+                <property name="resize-child1">0</property>
                 <property name="can_focus">1</property>
                 <property name="orientation">vertical</property>
                 <child>
@@ -6694,10 +6528,9 @@ ABCD</property>
             </child>
             <child>
               <object class="GtkPaned" id="natural56">
-                <property name="shrink-child2">False</property>
-                <property name="resize-child2">True</property>
-                <property name="shrink-child1">False</property>
-                <property name="resize-child1">False</property>
+                <property name="shrink-child2">0</property>
+                <property name="shrink-child1">0</property>
+                <property name="resize-child1">0</property>
                 <property name="can_focus">1</property>
                 <property name="orientation">vertical</property>
                 <child>
@@ -6728,61 +6561,59 @@ ABCD</property>
                 </child>
               </object>
             </child>
+            <layout>
+              <property name="left_attach">4</property>
+              <property name="top_attach">56</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">4</property>
-            <property name="top_attach">56</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="wrap57">
             <property name="label" translatable="yes">False</property>
+            <layout>
+              <property name="left_attach">0</property>
+              <property name="top_attach">57</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">0</property>
-            <property name="top_attach">57</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="ellipsize57">
             <property name="label" translatable="yes">none</property>
+            <layout>
+              <property name="left_attach">1</property>
+              <property name="top_attach">57</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">1</property>
-            <property name="top_attach">57</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="width_chars57">
             <property name="label" translatable="yes">8</property>
+            <layout>
+              <property name="left_attach">2</property>
+              <property name="top_attach">57</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">2</property>
-            <property name="top_attach">57</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="max_width_chars57">
             <property name="label" translatable="yes">12</property>
+            <layout>
+              <property name="left_attach">3</property>
+              <property name="top_attach">57</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">3</property>
-            <property name="top_attach">57</property>
-          </packing>
         </child>
         <child>
           <object class="GtkPaned" id="paned57">
-            <property name="shrink-child2">False</property>
-            <property name="resize-child2">True</property>
-            <property name="shrink-child1">False</property>
-            <property name="resize-child1">False</property>
+            <property name="shrink-child2">0</property>
+            <property name="shrink-child1">0</property>
+            <property name="resize-child1">0</property>
             <property name="can_focus">1</property>
             <child>
               <object class="GtkPaned" id="required57">
-                <property name="shrink-child2">False</property>
-                <property name="resize-child2">True</property>
-                <property name="shrink-child1">False</property>
-                <property name="resize-child1">False</property>
+                <property name="shrink-child2">0</property>
+                <property name="shrink-child1">0</property>
+                <property name="resize-child1">0</property>
                 <property name="can_focus">1</property>
                 <property name="orientation">vertical</property>
                 <child>
@@ -6815,10 +6646,9 @@ ABCD</property>
             </child>
             <child>
               <object class="GtkPaned" id="natural57">
-                <property name="shrink-child2">False</property>
-                <property name="resize-child2">True</property>
-                <property name="shrink-child1">False</property>
-                <property name="resize-child1">False</property>
+                <property name="shrink-child2">0</property>
+                <property name="shrink-child1">0</property>
+                <property name="resize-child1">0</property>
                 <property name="can_focus">1</property>
                 <property name="orientation">vertical</property>
                 <child>
@@ -6849,61 +6679,59 @@ ABCD</property>
                 </child>
               </object>
             </child>
+            <layout>
+              <property name="left_attach">4</property>
+              <property name="top_attach">57</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">4</property>
-            <property name="top_attach">57</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="wrap58">
             <property name="label" translatable="yes">True</property>
+            <layout>
+              <property name="left_attach">0</property>
+              <property name="top_attach">58</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">0</property>
-            <property name="top_attach">58</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="ellipsize58">
             <property name="label" translatable="yes">none</property>
+            <layout>
+              <property name="left_attach">1</property>
+              <property name="top_attach">58</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">1</property>
-            <property name="top_attach">58</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="width_chars58">
             <property name="label" translatable="yes">8</property>
+            <layout>
+              <property name="left_attach">2</property>
+              <property name="top_attach">58</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">2</property>
-            <property name="top_attach">58</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="max_width_chars58">
             <property name="label" translatable="yes">12</property>
+            <layout>
+              <property name="left_attach">3</property>
+              <property name="top_attach">58</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">3</property>
-            <property name="top_attach">58</property>
-          </packing>
         </child>
         <child>
           <object class="GtkPaned" id="paned58">
-            <property name="shrink-child2">False</property>
-            <property name="resize-child2">True</property>
-            <property name="shrink-child1">False</property>
-            <property name="resize-child1">False</property>
+            <property name="shrink-child2">0</property>
+            <property name="shrink-child1">0</property>
+            <property name="resize-child1">0</property>
             <property name="can_focus">1</property>
             <child>
               <object class="GtkPaned" id="required58">
-                <property name="shrink-child2">False</property>
-                <property name="resize-child2">True</property>
-                <property name="shrink-child1">False</property>
-                <property name="resize-child1">False</property>
+                <property name="shrink-child2">0</property>
+                <property name="shrink-child1">0</property>
+                <property name="resize-child1">0</property>
                 <property name="can_focus">1</property>
                 <property name="orientation">vertical</property>
                 <child>
@@ -6938,10 +6766,9 @@ ABCD</property>
             </child>
             <child>
               <object class="GtkPaned" id="natural58">
-                <property name="shrink-child2">False</property>
-                <property name="resize-child2">True</property>
-                <property name="shrink-child1">False</property>
-                <property name="resize-child1">False</property>
+                <property name="shrink-child2">0</property>
+                <property name="shrink-child1">0</property>
+                <property name="resize-child1">0</property>
                 <property name="can_focus">1</property>
                 <property name="orientation">vertical</property>
                 <child>
@@ -6972,61 +6799,59 @@ ABCD</property>
                 </child>
               </object>
             </child>
+            <layout>
+              <property name="left_attach">4</property>
+              <property name="top_attach">58</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">4</property>
-            <property name="top_attach">58</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="wrap59">
             <property name="label" translatable="yes">False</property>
+            <layout>
+              <property name="left_attach">0</property>
+              <property name="top_attach">59</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">0</property>
-            <property name="top_attach">59</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="ellipsize59">
             <property name="label" translatable="yes">end</property>
+            <layout>
+              <property name="left_attach">1</property>
+              <property name="top_attach">59</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">1</property>
-            <property name="top_attach">59</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="width_chars59">
             <property name="label" translatable="yes">8</property>
+            <layout>
+              <property name="left_attach">2</property>
+              <property name="top_attach">59</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">2</property>
-            <property name="top_attach">59</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="max_width_chars59">
             <property name="label" translatable="yes">12</property>
+            <layout>
+              <property name="left_attach">3</property>
+              <property name="top_attach">59</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">3</property>
-            <property name="top_attach">59</property>
-          </packing>
         </child>
         <child>
           <object class="GtkPaned" id="paned59">
-            <property name="shrink-child2">False</property>
-            <property name="resize-child2">True</property>
-            <property name="shrink-child1">False</property>
-            <property name="resize-child1">False</property>
+            <property name="shrink-child2">0</property>
+            <property name="shrink-child1">0</property>
+            <property name="resize-child1">0</property>
             <property name="can_focus">1</property>
             <child>
               <object class="GtkPaned" id="required59">
-                <property name="shrink-child2">False</property>
-                <property name="resize-child2">True</property>
-                <property name="shrink-child1">False</property>
-                <property name="resize-child1">False</property>
+                <property name="shrink-child2">0</property>
+                <property name="shrink-child1">0</property>
+                <property name="resize-child1">0</property>
                 <property name="can_focus">1</property>
                 <property name="orientation">vertical</property>
                 <child>
@@ -7059,10 +6884,9 @@ ABCD</property>
             </child>
             <child>
               <object class="GtkPaned" id="natural59">
-                <property name="shrink-child2">False</property>
-                <property name="resize-child2">True</property>
-                <property name="shrink-child1">False</property>
-                <property name="resize-child1">False</property>
+                <property name="shrink-child2">0</property>
+                <property name="shrink-child1">0</property>
+                <property name="resize-child1">0</property>
                 <property name="can_focus">1</property>
                 <property name="orientation">vertical</property>
                 <child>
@@ -7093,61 +6917,59 @@ ABCD</property>
                 </child>
               </object>
             </child>
+            <layout>
+              <property name="left_attach">4</property>
+              <property name="top_attach">59</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">4</property>
-            <property name="top_attach">59</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="wrap60">
             <property name="label" translatable="yes">True</property>
+            <layout>
+              <property name="left_attach">0</property>
+              <property name="top_attach">60</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">0</property>
-            <property name="top_attach">60</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="ellipsize60">
             <property name="label" translatable="yes">end</property>
+            <layout>
+              <property name="left_attach">1</property>
+              <property name="top_attach">60</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">1</property>
-            <property name="top_attach">60</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="width_chars60">
             <property name="label" translatable="yes">8</property>
+            <layout>
+              <property name="left_attach">2</property>
+              <property name="top_attach">60</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">2</property>
-            <property name="top_attach">60</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="max_width_chars60">
             <property name="label" translatable="yes">12</property>
+            <layout>
+              <property name="left_attach">3</property>
+              <property name="top_attach">60</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">3</property>
-            <property name="top_attach">60</property>
-          </packing>
         </child>
         <child>
           <object class="GtkPaned" id="paned60">
-            <property name="shrink-child2">False</property>
-            <property name="resize-child2">True</property>
-            <property name="shrink-child1">False</property>
-            <property name="resize-child1">False</property>
+            <property name="shrink-child2">0</property>
+            <property name="shrink-child1">0</property>
+            <property name="resize-child1">0</property>
             <property name="can_focus">1</property>
             <child>
               <object class="GtkPaned" id="required60">
-                <property name="shrink-child2">False</property>
-                <property name="resize-child2">True</property>
-                <property name="shrink-child1">False</property>
-                <property name="resize-child1">False</property>
+                <property name="shrink-child2">0</property>
+                <property name="shrink-child1">0</property>
+                <property name="resize-child1">0</property>
                 <property name="can_focus">1</property>
                 <property name="orientation">vertical</property>
                 <child>
@@ -7180,10 +7002,9 @@ ABCD</property>
             </child>
             <child>
               <object class="GtkPaned" id="natural60">
-                <property name="shrink-child2">False</property>
-                <property name="resize-child2">True</property>
-                <property name="shrink-child1">False</property>
-                <property name="resize-child1">False</property>
+                <property name="shrink-child2">0</property>
+                <property name="shrink-child1">0</property>
+                <property name="resize-child1">0</property>
                 <property name="can_focus">1</property>
                 <property name="orientation">vertical</property>
                 <child>
@@ -7214,61 +7035,59 @@ ABCD</property>
                 </child>
               </object>
             </child>
+            <layout>
+              <property name="left_attach">4</property>
+              <property name="top_attach">60</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">4</property>
-            <property name="top_attach">60</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="wrap61">
             <property name="label" translatable="yes">False</property>
+            <layout>
+              <property name="left_attach">0</property>
+              <property name="top_attach">61</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">0</property>
-            <property name="top_attach">61</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="ellipsize61">
             <property name="label" translatable="yes">none</property>
+            <layout>
+              <property name="left_attach">1</property>
+              <property name="top_attach">61</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">1</property>
-            <property name="top_attach">61</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="width_chars61">
             <property name="label" translatable="yes">12</property>
+            <layout>
+              <property name="left_attach">2</property>
+              <property name="top_attach">61</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">2</property>
-            <property name="top_attach">61</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="max_width_chars61">
             <property name="label" translatable="yes">12</property>
+            <layout>
+              <property name="left_attach">3</property>
+              <property name="top_attach">61</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">3</property>
-            <property name="top_attach">61</property>
-          </packing>
         </child>
         <child>
           <object class="GtkPaned" id="paned61">
-            <property name="shrink-child2">False</property>
-            <property name="resize-child2">True</property>
-            <property name="shrink-child1">False</property>
-            <property name="resize-child1">False</property>
+            <property name="shrink-child2">0</property>
+            <property name="shrink-child1">0</property>
+            <property name="resize-child1">0</property>
             <property name="can_focus">1</property>
             <child>
               <object class="GtkPaned" id="required61">
-                <property name="shrink-child2">False</property>
-                <property name="resize-child2">True</property>
-                <property name="shrink-child1">False</property>
-                <property name="resize-child1">False</property>
+                <property name="shrink-child2">0</property>
+                <property name="shrink-child1">0</property>
+                <property name="resize-child1">0</property>
                 <property name="can_focus">1</property>
                 <property name="orientation">vertical</property>
                 <child>
@@ -7301,10 +7120,9 @@ ABCD</property>
             </child>
             <child>
               <object class="GtkPaned" id="natural61">
-                <property name="shrink-child2">False</property>
-                <property name="resize-child2">True</property>
-                <property name="shrink-child1">False</property>
-                <property name="resize-child1">False</property>
+                <property name="shrink-child2">0</property>
+                <property name="shrink-child1">0</property>
+                <property name="resize-child1">0</property>
                 <property name="can_focus">1</property>
                 <property name="orientation">vertical</property>
                 <child>
@@ -7335,61 +7153,59 @@ ABCD</property>
                 </child>
               </object>
             </child>
+            <layout>
+              <property name="left_attach">4</property>
+              <property name="top_attach">61</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">4</property>
-            <property name="top_attach">61</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="wrap62">
             <property name="label" translatable="yes">True</property>
+            <layout>
+              <property name="left_attach">0</property>
+              <property name="top_attach">62</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">0</property>
-            <property name="top_attach">62</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="ellipsize62">
             <property name="label" translatable="yes">none</property>
+            <layout>
+              <property name="left_attach">1</property>
+              <property name="top_attach">62</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">1</property>
-            <property name="top_attach">62</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="width_chars62">
             <property name="label" translatable="yes">12</property>
+            <layout>
+              <property name="left_attach">2</property>
+              <property name="top_attach">62</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">2</property>
-            <property name="top_attach">62</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="max_width_chars62">
             <property name="label" translatable="yes">12</property>
+            <layout>
+              <property name="left_attach">3</property>
+              <property name="top_attach">62</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">3</property>
-            <property name="top_attach">62</property>
-          </packing>
         </child>
         <child>
           <object class="GtkPaned" id="paned62">
-            <property name="shrink-child2">False</property>
-            <property name="resize-child2">True</property>
-            <property name="shrink-child1">False</property>
-            <property name="resize-child1">False</property>
+            <property name="shrink-child2">0</property>
+            <property name="shrink-child1">0</property>
+            <property name="resize-child1">0</property>
             <property name="can_focus">1</property>
             <child>
               <object class="GtkPaned" id="required62">
-                <property name="shrink-child2">False</property>
-                <property name="resize-child2">True</property>
-                <property name="shrink-child1">False</property>
-                <property name="resize-child1">False</property>
+                <property name="shrink-child2">0</property>
+                <property name="shrink-child1">0</property>
+                <property name="resize-child1">0</property>
                 <property name="can_focus">1</property>
                 <property name="orientation">vertical</property>
                 <child>
@@ -7422,10 +7238,9 @@ ABCD</property>
             </child>
             <child>
               <object class="GtkPaned" id="natural62">
-                <property name="shrink-child2">False</property>
-                <property name="resize-child2">True</property>
-                <property name="shrink-child1">False</property>
-                <property name="resize-child1">False</property>
+                <property name="shrink-child2">0</property>
+                <property name="shrink-child1">0</property>
+                <property name="resize-child1">0</property>
                 <property name="can_focus">1</property>
                 <property name="orientation">vertical</property>
                 <child>
@@ -7456,61 +7271,59 @@ ABCD</property>
                 </child>
               </object>
             </child>
+            <layout>
+              <property name="left_attach">4</property>
+              <property name="top_attach">62</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">4</property>
-            <property name="top_attach">62</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="wrap63">
             <property name="label" translatable="yes">False</property>
+            <layout>
+              <property name="left_attach">0</property>
+              <property name="top_attach">63</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">0</property>
-            <property name="top_attach">63</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="ellipsize63">
             <property name="label" translatable="yes">end</property>
+            <layout>
+              <property name="left_attach">1</property>
+              <property name="top_attach">63</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">1</property>
-            <property name="top_attach">63</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="width_chars63">
             <property name="label" translatable="yes">12</property>
+            <layout>
+              <property name="left_attach">2</property>
+              <property name="top_attach">63</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">2</property>
-            <property name="top_attach">63</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="max_width_chars63">
             <property name="label" translatable="yes">12</property>
+            <layout>
+              <property name="left_attach">3</property>
+              <property name="top_attach">63</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">3</property>
-            <property name="top_attach">63</property>
-          </packing>
         </child>
         <child>
           <object class="GtkPaned" id="paned63">
-            <property name="shrink-child2">False</property>
-            <property name="resize-child2">True</property>
-            <property name="shrink-child1">False</property>
-            <property name="resize-child1">False</property>
+            <property name="shrink-child2">0</property>
+            <property name="shrink-child1">0</property>
+            <property name="resize-child1">0</property>
             <property name="can_focus">1</property>
             <child>
               <object class="GtkPaned" id="required63">
-                <property name="shrink-child2">False</property>
-                <property name="resize-child2">True</property>
-                <property name="shrink-child1">False</property>
-                <property name="resize-child1">False</property>
+                <property name="shrink-child2">0</property>
+                <property name="shrink-child1">0</property>
+                <property name="resize-child1">0</property>
                 <property name="can_focus">1</property>
                 <property name="orientation">vertical</property>
                 <child>
@@ -7543,10 +7356,9 @@ ABCD</property>
             </child>
             <child>
               <object class="GtkPaned" id="natural63">
-                <property name="shrink-child2">False</property>
-                <property name="resize-child2">True</property>
-                <property name="shrink-child1">False</property>
-                <property name="resize-child1">False</property>
+                <property name="shrink-child2">0</property>
+                <property name="shrink-child1">0</property>
+                <property name="resize-child1">0</property>
                 <property name="can_focus">1</property>
                 <property name="orientation">vertical</property>
                 <child>
@@ -7577,61 +7389,59 @@ ABCD</property>
                 </child>
               </object>
             </child>
+            <layout>
+              <property name="left_attach">4</property>
+              <property name="top_attach">63</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">4</property>
-            <property name="top_attach">63</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="wrap64">
             <property name="label" translatable="yes">True</property>
+            <layout>
+              <property name="left_attach">0</property>
+              <property name="top_attach">64</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">0</property>
-            <property name="top_attach">64</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="ellipsize64">
             <property name="label" translatable="yes">end</property>
+            <layout>
+              <property name="left_attach">1</property>
+              <property name="top_attach">64</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">1</property>
-            <property name="top_attach">64</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="width_chars64">
             <property name="label" translatable="yes">12</property>
+            <layout>
+              <property name="left_attach">2</property>
+              <property name="top_attach">64</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">2</property>
-            <property name="top_attach">64</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="max_width_chars64">
             <property name="label" translatable="yes">12</property>
+            <layout>
+              <property name="left_attach">3</property>
+              <property name="top_attach">64</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">3</property>
-            <property name="top_attach">64</property>
-          </packing>
         </child>
         <child>
           <object class="GtkPaned" id="paned64">
-            <property name="shrink-child2">False</property>
-            <property name="resize-child2">True</property>
-            <property name="shrink-child1">False</property>
-            <property name="resize-child1">False</property>
+            <property name="shrink-child2">0</property>
+            <property name="shrink-child1">0</property>
+            <property name="resize-child1">0</property>
             <property name="can_focus">1</property>
             <child>
               <object class="GtkPaned" id="required64">
-                <property name="shrink-child2">False</property>
-                <property name="resize-child2">True</property>
-                <property name="shrink-child1">False</property>
-                <property name="resize-child1">False</property>
+                <property name="shrink-child2">0</property>
+                <property name="shrink-child1">0</property>
+                <property name="resize-child1">0</property>
                 <property name="can_focus">1</property>
                 <property name="orientation">vertical</property>
                 <child>
@@ -7664,10 +7474,9 @@ ABCD</property>
             </child>
             <child>
               <object class="GtkPaned" id="natural64">
-                <property name="shrink-child2">False</property>
-                <property name="resize-child2">True</property>
-                <property name="shrink-child1">False</property>
-                <property name="resize-child1">False</property>
+                <property name="shrink-child2">0</property>
+                <property name="shrink-child1">0</property>
+                <property name="resize-child1">0</property>
                 <property name="can_focus">1</property>
                 <property name="orientation">vertical</property>
                 <child>
@@ -7698,11 +7507,11 @@ ABCD</property>
                 </child>
               </object>
             </child>
+            <layout>
+              <property name="left_attach">4</property>
+              <property name="top_attach">64</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">4</property>
-            <property name="top_attach">64</property>
-          </packing>
         </child>
       </object>
     </child>

diff --git a/testsuite/reftests/label-sizing.ui b/testsuite/reftests/label-sizing.ui
index b5fea3e15ea847f3b7db2010ac67a9b4c766d98d..69784ba8ee45fea0a1ac1caf84c461518ce0f1f6 100644 (file)
--- a/testsuite/reftests/label-sizing.ui
+++ b/testsuite/reftests/label-sizing.ui
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
 <interface>
   <object class="GtkWindow" id="window1">
     <property name="type">popup</property>
@@ -10,97 +11,95 @@
         <child>
           <object class="GtkLabel" id="label2">
             <property name="label" translatable="yes">wrap</property>
+            <layout>
+              <property name="left_attach">0</property>
+              <property name="top_attach">0</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">0</property>
-            <property name="top_attach">0</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="label3">
             <property name="label" translatable="yes">ellipsize</property>
+            <layout>
+              <property name="left_attach">1</property>
+              <property name="top_attach">0</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">1</property>
-            <property name="top_attach">0</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="label4">
             <property name="label" translatable="yes">width-chars</property>
+            <layout>
+              <property name="left_attach">2</property>
+              <property name="top_attach">0</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">2</property>
-            <property name="top_attach">0</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="label5">
             <property name="label" translatable="yes">max-width-chars</property>
+            <layout>
+              <property name="left_attach">3</property>
+              <property name="top_attach">0</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">3</property>
-            <property name="top_attach">0</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="label6">
             <property name="label" translatable="yes">results</property>
+            <layout>
+              <property name="left_attach">4</property>
+              <property name="top_attach">0</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">4</property>
-            <property name="top_attach">0</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="wrap1">
             <property name="label" translatable="yes">False</property>
+            <layout>
+              <property name="left_attach">0</property>
+              <property name="top_attach">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">0</property>
-            <property name="top_attach">1</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="ellipsize1">
             <property name="label" translatable="yes">none</property>
+            <layout>
+              <property name="left_attach">1</property>
+              <property name="top_attach">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">1</property>
-            <property name="top_attach">1</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="width_chars1">
             <property name="label" translatable="yes">-1</property>
+            <layout>
+              <property name="left_attach">2</property>
+              <property name="top_attach">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">2</property>
-            <property name="top_attach">1</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="max_width_chars1">
             <property name="label" translatable="yes">-1</property>
+            <layout>
+              <property name="left_attach">3</property>
+              <property name="top_attach">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">3</property>
-            <property name="top_attach">1</property>
-          </packing>
         </child>
         <child>
           <object class="GtkPaned" id="paned1">
-            <property name="shrink-child2">False</property>
-            <property name="resize-child2">True</property>
-            <property name="shrink-child1">False</property>
-            <property name="resize-child1">False</property>
+            <property name="shrink-child2">0</property>
+            <property name="shrink-child1">0</property>
+            <property name="resize-child1">0</property>
             <property name="can_focus">1</property>
             <child>
               <object class="GtkPaned" id="required1">
-                <property name="shrink-child2">False</property>
-                <property name="resize-child2">True</property>
-                <property name="shrink-child1">False</property>
-                <property name="resize-child1">False</property>
+                <property name="shrink-child2">0</property>
+                <property name="shrink-child1">0</property>
+                <property name="resize-child1">0</property>
                 <property name="can_focus">1</property>
                 <property name="orientation">vertical</property>
                 <child>
@@ -129,10 +128,9 @@
             </child>
             <child>
               <object class="GtkPaned" id="natural1">
-                <property name="shrink-child2">False</property>
-                <property name="resize-child2">True</property>
-                <property name="shrink-child1">False</property>
-                <property name="resize-child1">False</property>
+                <property name="shrink-child2">0</property>
+                <property name="shrink-child1">0</property>
+                <property name="resize-child1">0</property>
                 <property name="can_focus">1</property>
                 <property name="orientation">vertical</property>
                 <child>
@@ -159,61 +157,59 @@
                 </child>
               </object>
             </child>
+            <layout>
+              <property name="left_attach">4</property>
+              <property name="top_attach">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">4</property>
-            <property name="top_attach">1</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="wrap2">
             <property name="label" translatable="yes">True</property>
+            <layout>
+              <property name="left_attach">0</property>
+              <property name="top_attach">2</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">0</property>
-            <property name="top_attach">2</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="ellipsize2">
             <property name="label" translatable="yes">none</property>
+            <layout>
+              <property name="left_attach">1</property>
+              <property name="top_attach">2</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">1</property>
-            <property name="top_attach">2</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="width_chars2">
             <property name="label" translatable="yes">-1</property>
+            <layout>
+              <property name="left_attach">2</property>
+              <property name="top_attach">2</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">2</property>
-            <property name="top_attach">2</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="max_width_chars2">
             <property name="label" translatable="yes">-1</property>
+            <layout>
+              <property name="left_attach">3</property>
+              <property name="top_attach">2</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">3</property>
-            <property name="top_attach">2</property>
-          </packing>
         </child>
         <child>
           <object class="GtkPaned" id="paned2">
-            <property name="shrink-child2">False</property>
-            <property name="resize-child2">True</property>
-            <property name="shrink-child1">False</property>
-            <property name="resize-child1">False</property>
+            <property name="shrink-child2">0</property>
+            <property name="shrink-child1">0</property>
+            <property name="resize-child1">0</property>
             <property name="can_focus">1</property>
             <child>
               <object class="GtkPaned" id="required2">
-                <property name="shrink-child2">False</property>
-                <property name="resize-child2">True</property>
-                <property name="shrink-child1">False</property>
-                <property name="resize-child1">False</property>
+                <property name="shrink-child2">0</property>
+                <property name="shrink-child1">0</property>
+                <property name="resize-child1">0</property>
                 <property name="can_focus">1</property>
                 <property name="orientation">vertical</property>
                 <child>
@@ -244,10 +240,9 @@
             </child>
             <child>
               <object class="GtkPaned" id="natural2">
-                <property name="shrink-child2">False</property>
-                <property name="resize-child2">True</property>
-                <property name="shrink-child1">False</property>
-                <property name="resize-child1">False</property>
+                <property name="shrink-child2">0</property>
+                <property name="shrink-child1">0</property>
+                <property name="resize-child1">0</property>
                 <property name="can_focus">1</property>
                 <property name="orientation">vertical</property>
                 <child>
@@ -276,61 +271,59 @@
                 </child>
               </object>
             </child>
+            <layout>
+              <property name="left_attach">4</property>
+              <property name="top_attach">2</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">4</property>
-            <property name="top_attach">2</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="wrap3">
             <property name="label" translatable="yes">False</property>
+            <layout>
+              <property name="left_attach">0</property>
+              <property name="top_attach">3</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">0</property>
-            <property name="top_attach">3</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="ellipsize3">
             <property name="label" translatable="yes">end</property>
+            <layout>
+              <property name="left_attach">1</property>
+              <property name="top_attach">3</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">1</property>
-            <property name="top_attach">3</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="width_chars3">
             <property name="label" translatable="yes">-1</property>
+            <layout>
+              <property name="left_attach">2</property>
+              <property name="top_attach">3</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">2</property>
-            <property name="top_attach">3</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="max_width_chars3">
             <property name="label" translatable="yes">-1</property>
+            <layout>
+              <property name="left_attach">3</property>
+              <property name="top_attach">3</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">3</property>
-            <property name="top_attach">3</property>
-          </packing>
         </child>
         <child>
           <object class="GtkPaned" id="paned3">
-            <property name="shrink-child2">False</property>
-            <property name="resize-child2">True</property>
-            <property name="shrink-child1">False</property>
-            <property name="resize-child1">False</property>
+            <property name="shrink-child2">0</property>
+            <property name="shrink-child1">0</property>
+            <property name="resize-child1">0</property>
             <property name="can_focus">1</property>
             <child>
               <object class="GtkPaned" id="required3">
-                <property name="shrink-child2">False</property>
-                <property name="resize-child2">True</property>
-                <property name="shrink-child1">False</property>
-                <property name="resize-child1">False</property>
+                <property name="shrink-child2">0</property>
+                <property name="shrink-child1">0</property>
+                <property name="resize-child1">0</property>
                 <property name="can_focus">1</property>
                 <property name="orientation">vertical</property>
                 <child>
@@ -361,10 +354,9 @@
             </child>
             <child>
               <object class="GtkPaned" id="natural3">
-                <property name="shrink-child2">False</property>
-                <property name="resize-child2">True</property>
-                <property name="shrink-child1">False</property>
-                <property name="resize-child1">False</property>
+                <property name="shrink-child2">0</property>
+                <property name="shrink-child1">0</property>
+                <property name="resize-child1">0</property>
                 <property name="can_focus">1</property>
                 <property name="orientation">vertical</property>
                 <child>
@@ -393,61 +385,59 @@
                 </child>
               </object>
             </child>
+            <layout>
+              <property name="left_attach">4</property>
+              <property name="top_attach">3</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">4</property>
-            <property name="top_attach">3</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="wrap4">
             <property name="label" translatable="yes">True</property>
+            <layout>
+              <property name="left_attach">0</property>
+              <property name="top_attach">4</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">0</property>
-            <property name="top_attach">4</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="ellipsize4">
             <property name="label" translatable="yes">end</property>
+            <layout>
+              <property name="left_attach">1</property>
+              <property name="top_attach">4</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">1</property>
-            <property name="top_attach">4</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="width_chars4">
             <property name="label" translatable="yes">-1</property>
+            <layout>
+              <property name="left_attach">2</property>
+              <property name="top_attach">4</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">2</property>
-            <property name="top_attach">4</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="max_width_chars4">
             <property name="label" translatable="yes">-1</property>
+            <layout>
+              <property name="left_attach">3</property>
+              <property name="top_attach">4</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">3</property>
-            <property name="top_attach">4</property>
-          </packing>
         </child>
         <child>
           <object class="GtkPaned" id="paned4">
-            <property name="shrink-child2">False</property>
-            <property name="resize-child2">True</property>
-            <property name="shrink-child1">False</property>
-            <property name="resize-child1">False</property>
+            <property name="shrink-child2">0</property>
+            <property name="shrink-child1">0</property>
+            <property name="resize-child1">0</property>
             <property name="can_focus">1</property>
             <child>
               <object class="GtkPaned" id="required4">
-                <property name="shrink-child2">False</property>
-                <property name="resize-child2">True</property>
-                <property name="shrink-child1">False</property>
-                <property name="resize-child1">False</property>
+                <property name="shrink-child2">0</property>
+                <property name="shrink-child1">0</property>
+                <property name="resize-child1">0</property>
                 <property name="can_focus">1</property>
                 <property name="orientation">vertical</property>
                 <child>
@@ -480,10 +470,9 @@
             </child>
             <child>
               <object class="GtkPaned" id="natural4">
-                <property name="shrink-child2">False</property>
-                <property name="resize-child2">True</property>
-                <property name="shrink-child1">False</property>
-                <property name="resize-child1">False</property>
+                <property name="shrink-child2">0</property>
+                <property name="shrink-child1">0</property>
+                <property name="resize-child1">0</property>
                 <property name="can_focus">1</property>
                 <property name="orientation">vertical</property>
                 <child>
@@ -514,61 +503,59 @@
                 </child>
               </object>
             </child>
+            <layout>
+              <property name="left_attach">4</property>
+              <property name="top_attach">4</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">4</property>
-            <property name="top_attach">4</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="wrap5">
             <property name="label" translatable="yes">False</property>
+            <layout>
+              <property name="left_attach">0</property>
+              <property name="top_attach">5</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">0</property>
-            <property name="top_attach">5</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="ellipsize5">
             <property name="label" translatable="yes">none</property>
+            <layout>
+              <property name="left_attach">1</property>
+              <property name="top_attach">5</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">1</property>
-            <property name="top_attach">5</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="width_chars5">
             <property name="label" translatable="yes">4</property>
+            <layout>
+              <property name="left_attach">2</property>
+              <property name="top_attach">5</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">2</property>
-            <property name="top_attach">5</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="max_width_chars5">
             <property name="label" translatable="yes">-1</property>
+            <layout>
+              <property name="left_attach">3</property>
+              <property name="top_attach">5</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">3</property>
-            <property name="top_attach">5</property>
-          </packing>
         </child>
         <child>
           <object class="GtkPaned" id="paned5">
-            <property name="shrink-child2">False</property>
-            <property name="resize-child2">True</property>
-            <property name="shrink-child1">False</property>
-            <property name="resize-child1">False</property>
+            <property name="shrink-child2">0</property>
+            <property name="shrink-child1">0</property>
+            <property name="resize-child1">0</property>
             <property name="can_focus">1</property>
             <child>
               <object class="GtkPaned" id="required5">
-                <property name="shrink-child2">False</property>
-                <property name="resize-child2">True</property>
-                <property name="shrink-child1">False</property>
-                <property name="resize-child1">False</property>
+                <property name="shrink-child2">0</property>
+                <property name="shrink-child1">0</property>
+                <property name="resize-child1">0</property>
                 <property name="can_focus">1</property>
                 <property name="orientation">vertical</property>
                 <child>
@@ -599,10 +586,9 @@
             </child>
             <child>
               <object class="GtkPaned" id="natural5">
-                <property name="shrink-child2">False</property>
-                <property name="resize-child2">True</property>
-                <property name="shrink-child1">False</property>
-                <property name="resize-child1">False</property>
+                <property name="shrink-child2">0</property>
+                <property name="shrink-child1">0</property>
+                <property name="resize-child1">0</property>
                 <property name="can_focus">1</property>
                 <property name="orientation">vertical</property>
                 <child>
@@ -631,61 +617,59 @@
                 </child>
               </object>
             </child>
+            <layout>
+              <property name="left_attach">4</property>
+              <property name="top_attach">5</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">4</property>
-            <property name="top_attach">5</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="wrap6">
             <property name="label" translatable="yes">True</property>
+            <layout>
+              <property name="left_attach">0</property>
+              <property name="top_attach">6</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">0</property>
-            <property name="top_attach">6</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="ellipsize6">
             <property name="label" translatable="yes">none</property>
+            <layout>
+              <property name="left_attach">1</property>
+              <property name="top_attach">6</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">1</property>
-            <property name="top_attach">6</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="width_chars6">
             <property name="label" translatable="yes">4</property>
+            <layout>
+              <property name="left_attach">2</property>
+              <property name="top_attach">6</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">2</property>
-            <property name="top_attach">6</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="max_width_chars6">
             <property name="label" translatable="yes">-1</property>
+            <layout>
+              <property name="left_attach">3</property>
+              <property name="top_attach">6</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">3</property>
-            <property name="top_attach">6</property>
-          </packing>
         </child>
         <child>
           <object class="GtkPaned" id="paned6">
-            <property name="shrink-child2">False</property>
-            <property name="resize-child2">True</property>
-            <property name="shrink-child1">False</property>
-            <property name="resize-child1">False</property>
+            <property name="shrink-child2">0</property>
+            <property name="shrink-child1">0</property>
+            <property name="resize-child1">0</property>
             <property name="can_focus">1</property>
             <child>
               <object class="GtkPaned" id="required6">
-                <property name="shrink-child2">False</property>
-                <property name="resize-child2">True</property>
-                <property name="shrink-child1">False</property>
-                <property name="resize-child1">False</property>
+                <property name="shrink-child2">0</property>
+                <property name="shrink-child1">0</property>
+                <property name="resize-child1">0</property>
                 <property name="can_focus">1</property>
                 <property name="orientation">vertical</property>
                 <child>
@@ -718,10 +702,9 @@
             </child>
             <child>
               <object class="GtkPaned" id="natural6">
-                <property name="shrink-child2">False</property>
-                <property name="resize-child2">True</property>
-                <property name="shrink-child1">False</property>
-                <property name="resize-child1">False</property>
+                <property name="shrink-child2">0</property>
+                <property name="shrink-child1">0</property>
+                <property name="resize-child1">0</property>
                 <property name="can_focus">1</property>
                 <property name="orientation">vertical</property>
                 <child>
@@ -752,61 +735,59 @@
                 </child>
               </object>
             </child>
+            <layout>
+              <property name="left_attach">4</property>
+              <property name="top_attach">6</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">4</property>
-            <property name="top_attach">6</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="wrap7">
             <property name="label" translatable="yes">False</property>
+            <layout>
+              <property name="left_attach">0</property>
+              <property name="top_attach">7</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">0</property>
-            <property name="top_attach">7</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="ellipsize7">
             <property name="label" translatable="yes">end</property>
+            <layout>
+              <property name="left_attach">1</property>
+              <property name="top_attach">7</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">1</property>
-            <property name="top_attach">7</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="width_chars7">
             <property name="label" translatable="yes">4</property>
+            <layout>
+              <property name="left_attach">2</property>
+              <property name="top_attach">7</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">2</property>
-            <property name="top_attach">7</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="max_width_chars7">
             <property name="label" translatable="yes">-1</property>
+            <layout>
+              <property name="left_attach">3</property>
+              <property name="top_attach">7</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">3</property>
-            <property name="top_attach">7</property>
-          </packing>
         </child>
         <child>
           <object class="GtkPaned" id="paned7">
-            <property name="shrink-child2">False</property>
-            <property name="resize-child2">True</property>
-            <property name="shrink-child1">False</property>
-            <property name="resize-child1">False</property>
+            <property name="shrink-child2">0</property>
+            <property name="shrink-child1">0</property>
+            <property name="resize-child1">0</property>
             <property name="can_focus">1</property>
             <child>
               <object class="GtkPaned" id="required7">
-                <property name="shrink-child2">False</property>
-                <property name="resize-child2">True</property>
-                <property name="shrink-child1">False</property>
-                <property name="resize-child1">False</property>
+                <property name="shrink-child2">0</property>
+                <property name="shrink-child1">0</property>
+                <property name="resize-child1">0</property>
                 <property name="can_focus">1</property>
                 <property name="orientation">vertical</property>
                 <child>
@@ -839,10 +820,9 @@
             </child>
             <child>
               <object class="GtkPaned" id="natural7">
-                <property name="shrink-child2">False</property>
-                <property name="resize-child2">True</property>
-                <property name="shrink-child1">False</property>
-                <property name="resize-child1">False</property>
+                <property name="shrink-child2">0</property>
+                <property name="shrink-child1">0</property>
+                <property name="resize-child1">0</property>
                 <property name="can_focus">1</property>
                 <property name="orientation">vertical</property>
                 <child>
@@ -873,61 +853,59 @@
                 </child>
               </object>
             </child>
+            <layout>
+              <property name="left_attach">4</property>
+              <property name="top_attach">7</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">4</property>
-            <property name="top_attach">7</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="wrap8">
             <property name="label" translatable="yes">True</property>
+            <layout>
+              <property name="left_attach">0</property>
+              <property name="top_attach">8</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">0</property>
-            <property name="top_attach">8</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="ellipsize8">
             <property name="label" translatable="yes">end</property>
+            <layout>
+              <property name="left_attach">1</property>
+              <property name="top_attach">8</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">1</property>
-            <property name="top_attach">8</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="width_chars8">
             <property name="label" translatable="yes">4</property>
+            <layout>
+              <property name="left_attach">2</property>
+              <property name="top_attach">8</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">2</property>
-            <property name="top_attach">8</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="max_width_chars8">
             <property name="label" translatable="yes">-1</property>
+            <layout>
+              <property name="left_attach">3</property>
+              <property name="top_attach">8</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">3</property>
-            <property name="top_attach">8</property>
-          </packing>
         </child>
         <child>
           <object class="GtkPaned" id="paned8">
-            <property name="shrink-child2">False</property>
-            <property name="resize-child2">True</property>
-            <property name="shrink-child1">False</property>
-            <property name="resize-child1">False</property>
+            <property name="shrink-child2">0</property>
+            <property name="shrink-child1">0</property>
+            <property name="resize-child1">0</property>
             <property name="can_focus">1</property>
             <child>
               <object class="GtkPaned" id="required8">
-                <property name="shrink-child2">False</property>
-                <property name="resize-child2">True</property>
-                <property name="shrink-child1">False</property>
-                <property name="resize-child1">False</property>
+                <property name="shrink-child2">0</property>
+                <property name="shrink-child1">0</property>
+                <property name="resize-child1">0</property>
                 <property name="can_focus">1</property>
                 <property name="orientation">vertical</property>
                 <child>
@@ -962,10 +940,9 @@
             </child>
             <child>
               <object class="GtkPaned" id="natural8">
-                <property name="shrink-child2">False</property>
-                <property name="resize-child2">True</property>
-                <property name="shrink-child1">False</property>
-                <property name="resize-child1">False</property>
+                <property name="shrink-child2">0</property>
+                <property name="shrink-child1">0</property>
+                <property name="resize-child1">0</property>
                 <property name="can_focus">1</property>
                 <property name="orientation">vertical</property>
                 <child>
@@ -998,61 +975,59 @@
                 </child>
               </object>
             </child>
+            <layout>
+              <property name="left_attach">4</property>
+              <property name="top_attach">8</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">4</property>
-            <property name="top_attach">8</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="wrap9">
             <property name="label" translatable="yes">False</property>
+            <layout>
+              <property name="left_attach">0</property>
+              <property name="top_attach">9</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">0</property>
-            <property name="top_attach">9</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="ellipsize9">
             <property name="label" translatable="yes">none</property>
+            <layout>
+              <property name="left_attach">1</property>
+              <property name="top_attach">9</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">1</property>
-            <property name="top_attach">9</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="width_chars9">
             <property name="label" translatable="yes">8</property>
+            <layout>
+              <property name="left_attach">2</property>
+              <property name="top_attach">9</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">2</property>
-            <property name="top_attach">9</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="max_width_chars9">
             <property name="label" translatable="yes">-1</property>
+            <layout>
+              <property name="left_attach">3</property>
+              <property name="top_attach">9</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">3</property>
-            <property name="top_attach">9</property>
-          </packing>
         </child>
         <child>
           <object class="GtkPaned" id="paned9">
-            <property name="shrink-child2">False</property>
-            <property name="resize-child2">True</property>
-            <property name="shrink-child1">False</property>
-            <property name="resize-child1">False</property>
+            <property name="shrink-child2">0</property>
+            <property name="shrink-child1">0</property>
+            <property name="resize-child1">0</property>
             <property name="can_focus">1</property>
             <child>
               <object class="GtkPaned" id="required9">
-                <property name="shrink-child2">False</property>
-                <property name="resize-child2">True</property>
-                <property name="shrink-child1">False</property>
-                <property name="resize-child1">False</property>
+                <property name="shrink-child2">0</property>
+                <property name="shrink-child1">0</property>
+                <property name="resize-child1">0</property>
                 <property name="can_focus">1</property>
                 <property name="orientation">vertical</property>
                 <child>
@@ -1083,10 +1058,9 @@
             </child>
             <child>
               <object class="GtkPaned" id="natural9">
-                <property name="shrink-child2">False</property>
-                <property name="resize-child2">True</property>
-                <property name="shrink-child1">False</property>
-                <property name="resize-child1">False</property>
+                <property name="shrink-child2">0</property>
+                <property name="shrink-child1">0</property>
+                <property name="resize-child1">0</property>
                 <property name="can_focus">1</property>
                 <property name="orientation">vertical</property>
                 <child>
@@ -1115,61 +1089,59 @@
                 </child>
               </object>
             </child>
+            <layout>
+              <property name="left_attach">4</property>
+              <property name="top_attach">9</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">4</property>
-            <property name="top_attach">9</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="wrap10">
             <property name="label" translatable="yes">True</property>
+            <layout>
+              <property name="left_attach">0</property>
+              <property name="top_attach">10</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">0</property>
-            <property name="top_attach">10</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="ellipsize10">
             <property name="label" translatable="yes">none</property>
+            <layout>
+              <property name="left_attach">1</property>
+              <property name="top_attach">10</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">1</property>
-            <property name="top_attach">10</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="width_chars10">
             <property name="label" translatable="yes">8</property>
+            <layout>
+              <property name="left_attach">2</property>
+              <property name="top_attach">10</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">2</property>
-            <property name="top_attach">10</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="max_width_chars10">
             <property name="label" translatable="yes">-1</property>
+            <layout>
+              <property name="left_attach">3</property>
+              <property name="top_attach">10</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">3</property>
-            <property name="top_attach">10</property>
-          </packing>
         </child>
         <child>
           <object class="GtkPaned" id="paned10">
-            <property name="shrink-child2">False</property>
-            <property name="resize-child2">True</property>
-            <property name="shrink-child1">False</property>
-            <property name="resize-child1">False</property>
+            <property name="shrink-child2">0</property>
+            <property name="shrink-child1">0</property>
+            <property name="resize-child1">0</property>
             <property name="can_focus">1</property>
             <child>
               <object class="GtkPaned" id="required10">
-                <property name="shrink-child2">False</property>
-                <property name="resize-child2">True</property>
-                <property name="shrink-child1">False</property>
-                <property name="resize-child1">False</property>
+                <property name="shrink-child2">0</property>
+                <property name="shrink-child1">0</property>
+                <property name="resize-child1">0</property>
                 <property name="can_focus">1</property>
                 <property name="orientation">vertical</property>
                 <child>
@@ -1202,10 +1174,9 @@
             </child>
             <child>
               <object class="GtkPaned" id="natural10">
-                <property name="shrink-child2">False</property>
-                <property name="resize-child2">True</property>
-                <property name="shrink-child1">False</property>
-                <property name="resize-child1">False</property>
+                <property name="shrink-child2">0</property>
+                <property name="shrink-child1">0</property>
+                <property name="resize-child1">0</property>
                 <property name="can_focus">1</property>
                 <property name="orientation">vertical</property>
                 <child>
@@ -1236,61 +1207,59 @@
                 </child>
               </object>
             </child>
+            <layout>
+              <property name="left_attach">4</property>
+              <property name="top_attach">10</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">4</property>
-            <property name="top_attach">10</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="wrap11">
             <property name="label" translatable="yes">False</property>
+            <layout>
+              <property name="left_attach">0</property>
+              <property name="top_attach">11</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">0</property>
-            <property name="top_attach">11</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="ellipsize11">
             <property name="label" translatable="yes">end</property>
+            <layout>
+              <property name="left_attach">1</property>
+              <property name="top_attach">11</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">1</property>
-            <property name="top_attach">11</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="width_chars11">
             <property name="label" translatable="yes">8</property>
+            <layout>
+              <property name="left_attach">2</property>
+              <property name="top_attach">11</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">2</property>
-            <property name="top_attach">11</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="max_width_chars11">
             <property name="label" translatable="yes">-1</property>
+            <layout>
+              <property name="left_attach">3</property>
+              <property name="top_attach">11</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">3</property>
-            <property name="top_attach">11</property>
-          </packing>
         </child>
         <child>
           <object class="GtkPaned" id="paned11">
-            <property name="shrink-child2">False</property>
-            <property name="resize-child2">True</property>
-            <property name="shrink-child1">False</property>
-            <property name="resize-child1">False</property>
+            <property name="shrink-child2">0</property>
+            <property name="shrink-child1">0</property>
+            <property name="resize-child1">0</property>
             <property name="can_focus">1</property>
             <child>
               <object class="GtkPaned" id="required11">
-                <property name="shrink-child2">False</property>
-                <property name="resize-child2">True</property>
-                <property name="shrink-child1">False</property>
-                <property name="resize-child1">False</property>
+                <property name="shrink-child2">0</property>
+                <property name="shrink-child1">0</property>
+                <property name="resize-child1">0</property>
                 <property name="can_focus">1</property>
                 <property name="orientation">vertical</property>
                 <child>
@@ -1323,10 +1292,9 @@
             </child>
             <child>
               <object class="GtkPaned" id="natural11">
-                <property name="shrink-child2">False</property>
-                <property name="resize-child2">True</property>
-                <property name="shrink-child1">False</property>
-                <property name="resize-child1">False</property>
+                <property name="shrink-child2">0</property>
+                <property name="shrink-child1">0</property>
+                <property name="resize-child1">0</property>
                 <property name="can_focus">1</property>
                 <property name="orientation">vertical</property>
                 <child>
@@ -1357,61 +1325,59 @@
                 </child>
               </object>
             </child>
+            <layout>
+              <property name="left_attach">4</property>
+              <property name="top_attach">11</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">4</property>
-            <property name="top_attach">11</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="wrap12">
             <property name="label" translatable="yes">True</property>
+            <layout>
+              <property name="left_attach">0</property>
+              <property name="top_attach">12</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">0</property>
-            <property name="top_attach">12</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="ellipsize12">
             <property name="label" translatable="yes">end</property>
+            <layout>
+              <property name="left_attach">1</property>
+              <property name="top_attach">12</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">1</property>
-            <property name="top_attach">12</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="width_chars12">
             <property name="label" translatable="yes">8</property>
+            <layout>
+              <property name="left_attach">2</property>
+              <property name="top_attach">12</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">2</property>
-            <property name="top_attach">12</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="max_width_chars12">
             <property name="label" translatable="yes">-1</property>
+            <layout>
+              <property name="left_attach">3</property>
+              <property name="top_attach">12</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">3</property>
-            <property name="top_attach">12</property>
-          </packing>
         </child>
         <child>
           <object class="GtkPaned" id="paned12">
-            <property name="shrink-child2">False</property>
-            <property name="resize-child2">True</property>
-            <property name="shrink-child1">False</property>
-            <property name="resize-child1">False</property>
+            <property name="shrink-child2">0</property>
+            <property name="shrink-child1">0</property>
+            <property name="resize-child1">0</property>
             <property name="can_focus">1</property>
             <child>
               <object class="GtkPaned" id="required12">
-                <property name="shrink-child2">False</property>
-                <property name="resize-child2">True</property>
-                <property name="shrink-child1">False</property>
-                <property name="resize-child1">False</property>
+                <property name="shrink-child2">0</property>
+                <property name="shrink-child1">0</property>
+                <property name="resize-child1">0</property>
                 <property name="can_focus">1</property>
                 <property name="orientation">vertical</property>
                 <child>
@@ -1446,10 +1412,9 @@
             </child>
             <child>
               <object class="GtkPaned" id="natural12">
-                <property name="shrink-child2">False</property>
-                <property name="resize-child2">True</property>
-                <property name="shrink-child1">False</property>
-                <property name="resize-child1">False</property>
+                <property name="shrink-child2">0</property>
+                <property name="shrink-child1">0</property>
+                <property name="resize-child1">0</property>
                 <property name="can_focus">1</property>
                 <property name="orientation">vertical</property>
                 <child>
@@ -1482,61 +1447,59 @@
                 </child>
               </object>
             </child>
+            <layout>
+              <property name="left_attach">4</property>
+              <property name="top_attach">12</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">4</property>
-            <property name="top_attach">12</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="wrap13">
             <property name="label" translatable="yes">False</property>
+            <layout>
+              <property name="left_attach">0</property>
+              <property name="top_attach">13</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">0</property>
-            <property name="top_attach">13</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="ellipsize13">
             <property name="label" translatable="yes">none</property>
+            <layout>
+              <property name="left_attach">1</property>
+              <property name="top_attach">13</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">1</property>
-            <property name="top_attach">13</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="width_chars13">
             <property name="label" translatable="yes">12</property>
+            <layout>
+              <property name="left_attach">2</property>
+              <property name="top_attach">13</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">2</property>
-            <property name="top_attach">13</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="max_width_chars13">
             <property name="label" translatable="yes">-1</property>
+            <layout>
+              <property name="left_attach">3</property>
+              <property name="top_attach">13</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">3</property>
-            <property name="top_attach">13</property>
-          </packing>
         </child>
         <child>
           <object class="GtkPaned" id="paned13">
-            <property name="shrink-child2">False</property>
-            <property name="resize-child2">True</property>
-            <property name="shrink-child1">False</property>
-            <property name="resize-child1">False</property>
+            <property name="shrink-child2">0</property>
+            <property name="shrink-child1">0</property>
+            <property name="resize-child1">0</property>
             <property name="can_focus">1</property>
             <child>
               <object class="GtkPaned" id="required13">
-                <property name="shrink-child2">False</property>
-                <property name="resize-child2">True</property>
-                <property name="shrink-child1">False</property>
-                <property name="resize-child1">False</property>
+                <property name="shrink-child2">0</property>
+                <property name="shrink-child1">0</property>
+                <property name="resize-child1">0</property>
                 <property name="can_focus">1</property>
                 <property name="orientation">vertical</property>
                 <child>
@@ -1567,10 +1530,9 @@
             </child>
             <child>
               <object class="GtkPaned" id="natural13">
-                <property name="shrink-child2">False</property>
-                <property name="resize-child2">True</property>
-                <property name="shrink-child1">False</property>
-                <property name="resize-child1">False</property>
+                <property name="shrink-child2">0</property>
+                <property name="shrink-child1">0</property>
+                <property name="resize-child1">0</property>
                 <property name="can_focus">1</property>
                 <property name="orientation">vertical</property>
                 <child>
@@ -1599,61 +1561,59 @@
                 </child>
               </object>
             </child>
+            <layout>
+              <property name="left_attach">4</property>
+              <property name="top_attach">13</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">4</property>
-            <property name="top_attach">13</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="wrap14">
             <property name="label" translatable="yes">True</property>
+            <layout>
+              <property name="left_attach">0</property>
+              <property name="top_attach">14</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">0</property>
-            <property name="top_attach">14</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="ellipsize14">
             <property name="label" translatable="yes">none</property>
+            <layout>
+              <property name="left_attach">1</property>
+              <property name="top_attach">14</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">1</property>
-            <property name="top_attach">14</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="width_chars14">
             <property name="label" translatable="yes">12</property>
+            <layout>
+              <property name="left_attach">2</property>
+              <property name="top_attach">14</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">2</property>
-            <property name="top_attach">14</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="max_width_chars14">
             <property name="label" translatable="yes">-1</property>
+            <layout>
+              <property name="left_attach">3</property>
+              <property name="top_attach">14</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">3</property>
-            <property name="top_attach">14</property>
-          </packing>
         </child>
         <child>
           <object class="GtkPaned" id="paned14">
-            <property name="shrink-child2">False</property>
-            <property name="resize-child2">True</property>
-            <property name="shrink-child1">False</property>
-            <property name="resize-child1">False</property>
+            <property name="shrink-child2">0</property>
+            <property name="shrink-child1">0</property>
+            <property name="resize-child1">0</property>
             <property name="can_focus">1</property>
             <child>
               <object class="GtkPaned" id="required14">
-                <property name="shrink-child2">False</property>
-                <property name="resize-child2">True</property>
-                <property name="shrink-child1">False</property>
-                <property name="resize-child1">False</property>
+                <property name="shrink-child2">0</property>
+                <property name="shrink-child1">0</property>
+                <property name="resize-child1">0</property>
                 <property name="can_focus">1</property>
                 <property name="orientation">vertical</property>
                 <child>
@@ -1686,10 +1646,9 @@
             </child>
             <child>
               <object class="GtkPaned" id="natural14">
-                <property name="shrink-child2">False</property>
-                <property name="resize-child2">True</property>
-                <property name="shrink-child1">False</property>
-                <property name="resize-child1">False</property>
+                <property name="shrink-child2">0</property>
+                <property name="shrink-child1">0</property>
+                <property name="resize-child1">0</property>
                 <property name="can_focus">1</property>
                 <property name="orientation">vertical</property>
                 <child>
@@ -1720,61 +1679,59 @@
                 </child>
               </object>
             </child>
+            <layout>
+              <property name="left_attach">4</property>
+              <property name="top_attach">14</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">4</property>
-            <property name="top_attach">14</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="wrap15">
             <property name="label" translatable="yes">False</property>
+            <layout>
+              <property name="left_attach">0</property>
+              <property name="top_attach">15</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">0</property>
-            <property name="top_attach">15</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="ellipsize15">
             <property name="label" translatable="yes">end</property>
+            <layout>
+              <property name="left_attach">1</property>
+              <property name="top_attach">15</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">1</property>
-            <property name="top_attach">15</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="width_chars15">
             <property name="label" translatable="yes">12</property>
+            <layout>
+              <property name="left_attach">2</property>
+              <property name="top_attach">15</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">2</property>
-            <property name="top_attach">15</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="max_width_chars15">
             <property name="label" translatable="yes">-1</property>
+            <layout>
+              <property name="left_attach">3</property>
+              <property name="top_attach">15</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">3</property>
-            <property name="top_attach">15</property>
-          </packing>
         </child>
         <child>
           <object class="GtkPaned" id="paned15">
-            <property name="shrink-child2">False</property>
-            <property name="resize-child2">True</property>
-            <property name="shrink-child1">False</property>
-            <property name="resize-child1">False</property>
+            <property name="shrink-child2">0</property>
+            <property name="shrink-child1">0</property>
+            <property name="resize-child1">0</property>
             <property name="can_focus">1</property>
             <child>
               <object class="GtkPaned" id="required15">
-                <property name="shrink-child2">False</property>
-                <property name="resize-child2">True</property>
-                <property name="shrink-child1">False</property>
-                <property name="resize-child1">False</property>
+                <property name="shrink-child2">0</property>
+                <property name="shrink-child1">0</property>
+                <property name="resize-child1">0</property>
                 <property name="can_focus">1</property>
                 <property name="orientation">vertical</property>
                 <child>
@@ -1807,10 +1764,9 @@
             </child>
             <child>
               <object class="GtkPaned" id="natural15">
-                <property name="shrink-child2">False</property>
-                <property name="resize-child2">True</property>
-                <property name="shrink-child1">False</property>
-                <property name="resize-child1">False</property>
+                <property name="shrink-child2">0</property>
+                <property name="shrink-child1">0</property>
+                <property name="resize-child1">0</property>
                 <property name="can_focus">1</property>
                 <property name="orientation">vertical</property>
                 <child>
@@ -1841,61 +1797,59 @@
                 </child>
               </object>
             </child>
+            <layout>
+              <property name="left_attach">4</property>
+              <property name="top_attach">15</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">4</property>
-            <property name="top_attach">15</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="wrap16">
             <property name="label" translatable="yes">True</property>
+            <layout>
+              <property name="left_attach">0</property>
+              <property name="top_attach">16</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">0</property>
-            <property name="top_attach">16</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="ellipsize16">
             <property name="label" translatable="yes">end</property>
+            <layout>
+              <property name="left_attach">1</property>
+              <property name="top_attach">16</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">1</property>
-            <property name="top_attach">16</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="width_chars16">
             <property name="label" translatable="yes">12</property>
+            <layout>
+              <property name="left_attach">2</property>
+              <property name="top_attach">16</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">2</property>
-            <property name="top_attach">16</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="max_width_chars16">
             <property name="label" translatable="yes">-1</property>
+            <layout>
+              <property name="left_attach">3</property>
+              <property name="top_attach">16</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">3</property>
-            <property name="top_attach">16</property>
-          </packing>
         </child>
         <child>
           <object class="GtkPaned" id="paned16">
-            <property name="shrink-child2">False</property>
-            <property name="resize-child2">True</property>
-            <property name="shrink-child1">False</property>
-            <property name="resize-child1">False</property>
+            <property name="shrink-child2">0</property>
+            <property name="shrink-child1">0</property>
+            <property name="resize-child1">0</property>
             <property name="can_focus">1</property>
             <child>
               <object class="GtkPaned" id="required16">
-                <property name="shrink-child2">False</property>
-                <property name="resize-child2">True</property>
-                <property name="shrink-child1">False</property>
-                <property name="resize-child1">False</property>
+                <property name="shrink-child2">0</property>
+                <property name="shrink-child1">0</property>
+                <property name="resize-child1">0</property>
                 <property name="can_focus">1</property>
                 <property name="orientation">vertical</property>
                 <child>
@@ -1930,10 +1884,9 @@
             </child>
             <child>
               <object class="GtkPaned" id="natural16">
-                <property name="shrink-child2">False</property>
-                <property name="resize-child2">True</property>
-                <property name="shrink-child1">False</property>
-                <property name="resize-child1">False</property>
+                <property name="shrink-child2">0</property>
+                <property name="shrink-child1">0</property>
+                <property name="resize-child1">0</property>
                 <property name="can_focus">1</property>
                 <property name="orientation">vertical</property>
                 <child>
@@ -1966,61 +1919,59 @@
                 </child>
               </object>
             </child>
+            <layout>
+              <property name="left_attach">4</property>
+              <property name="top_attach">16</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">4</property>
-            <property name="top_attach">16</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="wrap17">
             <property name="label" translatable="yes">False</property>
+            <layout>
+              <property name="left_attach">0</property>
+              <property name="top_attach">17</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">0</property>
-            <property name="top_attach">17</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="ellipsize17">
             <property name="label" translatable="yes">none</property>
+            <layout>
+              <property name="left_attach">1</property>
+              <property name="top_attach">17</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">1</property>
-            <property name="top_attach">17</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="width_chars17">
             <property name="label" translatable="yes">-1</property>
+            <layout>
+              <property name="left_attach">2</property>
+              <property name="top_attach">17</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">2</property>
-            <property name="top_attach">17</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="max_width_chars17">
             <property name="label" translatable="yes">4</property>
+            <layout>
+              <property name="left_attach">3</property>
+              <property name="top_attach">17</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">3</property>
-            <property name="top_attach">17</property>
-          </packing>
         </child>
         <child>
           <object class="GtkPaned" id="paned17">
-            <property name="shrink-child2">False</property>
-            <property name="resize-child2">True</property>
-            <property name="shrink-child1">False</property>
-            <property name="resize-child1">False</property>
+            <property name="shrink-child2">0</property>
+            <property name="shrink-child1">0</property>
+            <property name="resize-child1">0</property>
             <property name="can_focus">1</property>
             <child>
               <object class="GtkPaned" id="required17">
-                <property name="shrink-child2">False</property>
-                <property name="resize-child2">True</property>
-                <property name="shrink-child1">False</property>
-                <property name="resize-child1">False</property>
+                <property name="shrink-child2">0</property>
+                <property name="shrink-child1">0</property>
+                <property name="resize-child1">0</property>
                 <property name="can_focus">1</property>
                 <property name="orientation">vertical</property>
                 <child>
@@ -2051,10 +2002,9 @@
             </child>
             <child>
               <object class="GtkPaned" id="natural17">
-                <property name="shrink-child2">False</property>
-                <property name="resize-child2">True</property>
-                <property name="shrink-child1">False</property>
-                <property name="resize-child1">False</property>
+                <property name="shrink-child2">0</property>
+                <property name="shrink-child1">0</property>
+                <property name="resize-child1">0</property>
                 <property name="can_focus">1</property>
                 <property name="orientation">vertical</property>
                 <child>
@@ -2083,61 +2033,59 @@
                 </child>
               </object>
             </child>
+            <layout>
+              <property name="left_attach">4</property>
+              <property name="top_attach">17</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">4</property>
-            <property name="top_attach">17</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="wrap18">
             <property name="label" translatable="yes">True</property>
+            <layout>
+              <property name="left_attach">0</property>
+              <property name="top_attach">18</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">0</property>
-            <property name="top_attach">18</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="ellipsize18">
             <property name="label" translatable="yes">none</property>
+            <layout>
+              <property name="left_attach">1</property>
+              <property name="top_attach">18</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">1</property>
-            <property name="top_attach">18</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="width_chars18">
             <property name="label" translatable="yes">-1</property>
+            <layout>
+              <property name="left_attach">2</property>
+              <property name="top_attach">18</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">2</property>
-            <property name="top_attach">18</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="max_width_chars18">
             <property name="label" translatable="yes">4</property>
+            <layout>
+              <property name="left_attach">3</property>
+              <property name="top_attach">18</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">3</property>
-            <property name="top_attach">18</property>
-          </packing>
         </child>
         <child>
           <object class="GtkPaned" id="paned18">
-            <property name="shrink-child2">False</property>
-            <property name="resize-child2">True</property>
-            <property name="shrink-child1">False</property>
-            <property name="resize-child1">False</property>
+            <property name="shrink-child2">0</property>
+            <property name="shrink-child1">0</property>
+            <property name="resize-child1">0</property>
             <property name="can_focus">1</property>
             <child>
               <object class="GtkPaned" id="required18">
-                <property name="shrink-child2">False</property>
-                <property name="resize-child2">True</property>
-                <property name="shrink-child1">False</property>
-                <property name="resize-child1">False</property>
+                <property name="shrink-child2">0</property>
+                <property name="shrink-child1">0</property>
+                <property name="resize-child1">0</property>
                 <property name="can_focus">1</property>
                 <property name="orientation">vertical</property>
                 <child>
@@ -2170,10 +2118,9 @@
             </child>
             <child>
               <object class="GtkPaned" id="natural18">
-                <property name="shrink-child2">False</property>
-                <property name="resize-child2">True</property>
-                <property name="shrink-child1">False</property>
-                <property name="resize-child1">False</property>
+                <property name="shrink-child2">0</property>
+                <property name="shrink-child1">0</property>
+                <property name="resize-child1">0</property>
                 <property name="can_focus">1</property>
                 <property name="orientation">vertical</property>
                 <child>
@@ -2204,61 +2151,59 @@
                 </child>
               </object>
             </child>
+            <layout>
+              <property name="left_attach">4</property>
+              <property name="top_attach">18</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">4</property>
-            <property name="top_attach">18</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="wrap19">
             <property name="label" translatable="yes">False</property>
+            <layout>
+              <property name="left_attach">0</property>
+              <property name="top_attach">19</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">0</property>
-            <property name="top_attach">19</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="ellipsize19">
             <property name="label" translatable="yes">end</property>
+            <layout>
+              <property name="left_attach">1</property>
+              <property name="top_attach">19</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">1</property>
-            <property name="top_attach">19</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="width_chars19">
             <property name="label" translatable="yes">-1</property>
+            <layout>
+              <property name="left_attach">2</property>
+              <property name="top_attach">19</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">2</property>
-            <property name="top_attach">19</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="max_width_chars19">
             <property name="label" translatable="yes">4</property>
+            <layout>
+              <property name="left_attach">3</property>
+              <property name="top_attach">19</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">3</property>
-            <property name="top_attach">19</property>
-          </packing>
         </child>
         <child>
           <object class="GtkPaned" id="paned19">
-            <property name="shrink-child2">False</property>
-            <property name="resize-child2">True</property>
-            <property name="shrink-child1">False</property>
-            <property name="resize-child1">False</property>
+            <property name="shrink-child2">0</property>
+            <property name="shrink-child1">0</property>
+            <property name="resize-child1">0</property>
             <property name="can_focus">1</property>
             <child>
               <object class="GtkPaned" id="required19">
-                <property name="shrink-child2">False</property>
-                <property name="resize-child2">True</property>
-                <property name="shrink-child1">False</property>
-                <property name="resize-child1">False</property>
+                <property name="shrink-child2">0</property>
+                <property name="shrink-child1">0</property>
+                <property name="resize-child1">0</property>
                 <property name="can_focus">1</property>
                 <property name="orientation">vertical</property>
                 <child>
@@ -2291,10 +2236,9 @@
             </child>
             <child>
               <object class="GtkPaned" id="natural19">
-                <property name="shrink-child2">False</property>
-                <property name="resize-child2">True</property>
-                <property name="shrink-child1">False</property>
-                <property name="resize-child1">False</property>
+                <property name="shrink-child2">0</property>
+                <property name="shrink-child1">0</property>
+                <property name="resize-child1">0</property>
                 <property name="can_focus">1</property>
                 <property name="orientation">vertical</property>
                 <child>
@@ -2325,61 +2269,59 @@
                 </child>
               </object>
             </child>
+            <layout>
+              <property name="left_attach">4</property>
+              <property name="top_attach">19</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">4</property>
-            <property name="top_attach">19</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="wrap20">
             <property name="label" translatable="yes">True</property>
+            <layout>
+              <property name="left_attach">0</property>
+              <property name="top_attach">20</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">0</property>
-            <property name="top_attach">20</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="ellipsize20">
             <property name="label" translatable="yes">end</property>
+            <layout>
+              <property name="left_attach">1</property>
+              <property name="top_attach">20</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">1</property>
-            <property name="top_attach">20</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="width_chars20">
             <property name="label" translatable="yes">-1</property>
+            <layout>
+              <property name="left_attach">2</property>
+              <property name="top_attach">20</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">2</property>
-            <property name="top_attach">20</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="max_width_chars20">
             <property name="label" translatable="yes">4</property>
+            <layout>
+              <property name="left_attach">3</property>
+              <property name="top_attach">20</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">3</property>
-            <property name="top_attach">20</property>
-          </packing>
         </child>
         <child>
           <object class="GtkPaned" id="paned20">
-            <property name="shrink-child2">False</property>
-            <property name="resize-child2">True</property>
-            <property name="shrink-child1">False</property>
-            <property name="resize-child1">False</property>
+            <property name="shrink-child2">0</property>
+            <property name="shrink-child1">0</property>
+            <property name="resize-child1">0</property>
             <property name="can_focus">1</property>
             <child>
               <object class="GtkPaned" id="required20">
-                <property name="shrink-child2">False</property>
-                <property name="resize-child2">True</property>
-                <property name="shrink-child1">False</property>
-                <property name="resize-child1">False</property>
+                <property name="shrink-child2">0</property>
+                <property name="shrink-child1">0</property>
+                <property name="resize-child1">0</property>
                 <property name="can_focus">1</property>
                 <property name="orientation">vertical</property>
                 <child>
@@ -2414,10 +2356,9 @@
             </child>
             <child>
               <object class="GtkPaned" id="natural20">
-                <property name="shrink-child2">False</property>
-                <property name="resize-child2">True</property>
-                <property name="shrink-child1">False</property>
-                <property name="resize-child1">False</property>
+                <property name="shrink-child2">0</property>
+                <property name="shrink-child1">0</property>
+                <property name="resize-child1">0</property>
                 <property name="can_focus">1</property>
                 <property name="orientation">vertical</property>
                 <child>
@@ -2450,61 +2391,59 @@
                 </child>
               </object>
             </child>
+            <layout>
+              <property name="left_attach">4</property>
+              <property name="top_attach">20</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">4</property>
-            <property name="top_attach">20</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="wrap21">
             <property name="label" translatable="yes">False</property>
+            <layout>
+              <property name="left_attach">0</property>
+              <property name="top_attach">21</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">0</property>
-            <property name="top_attach">21</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="ellipsize21">
             <property name="label" translatable="yes">none</property>
+            <layout>
+              <property name="left_attach">1</property>
+              <property name="top_attach">21</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">1</property>
-            <property name="top_attach">21</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="width_chars21">
             <property name="label" translatable="yes">4</property>
+            <layout>
+              <property name="left_attach">2</property>
+              <property name="top_attach">21</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">2</property>
-            <property name="top_attach">21</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="max_width_chars21">
             <property name="label" translatable="yes">4</property>
+            <layout>
+              <property name="left_attach">3</property>
+              <property name="top_attach">21</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">3</property>
-            <property name="top_attach">21</property>
-          </packing>
         </child>
         <child>
           <object class="GtkPaned" id="paned21">
-            <property name="shrink-child2">False</property>
-            <property name="resize-child2">True</property>
-            <property name="shrink-child1">False</property>
-            <property name="resize-child1">False</property>
+            <property name="shrink-child2">0</property>
+            <property name="shrink-child1">0</property>
+            <property name="resize-child1">0</property>
             <property name="can_focus">1</property>
             <child>
               <object class="GtkPaned" id="required21">
-                <property name="shrink-child2">False</property>
-                <property name="resize-child2">True</property>
-                <property name="shrink-child1">False</property>
-                <property name="resize-child1">False</property>
+                <property name="shrink-child2">0</property>
+                <property name="shrink-child1">0</property>
+                <property name="resize-child1">0</property>
                 <property name="can_focus">1</property>
                 <property name="orientation">vertical</property>
                 <child>
@@ -2537,10 +2476,9 @@
             </child>
             <child>
               <object class="GtkPaned" id="natural21">
-                <property name="shrink-child2">False</property>
-                <property name="resize-child2">True</property>
-                <property name="shrink-child1">False</property>
-                <property name="resize-child1">False</property>
+                <property name="shrink-child2">0</property>
+                <property name="shrink-child1">0</property>
+                <property name="resize-child1">0</property>
                 <property name="can_focus">1</property>
                 <property name="orientation">vertical</property>
                 <child>
@@ -2571,61 +2509,59 @@
                 </child>
               </object>
             </child>
+            <layout>
+              <property name="left_attach">4</property>
+              <property name="top_attach">21</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">4</property>
-            <property name="top_attach">21</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="wrap22">
             <property name="label" translatable="yes">True</property>
+            <layout>
+              <property name="left_attach">0</property>
+              <property name="top_attach">22</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">0</property>
-            <property name="top_attach">22</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="ellipsize22">
             <property name="label" translatable="yes">none</property>
+            <layout>
+              <property name="left_attach">1</property>
+              <property name="top_attach">22</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">1</property>
-            <property name="top_attach">22</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="width_chars22">
             <property name="label" translatable="yes">4</property>
+            <layout>
+              <property name="left_attach">2</property>
+              <property name="top_attach">22</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">2</property>
-            <property name="top_attach">22</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="max_width_chars22">
             <property name="label" translatable="yes">4</property>
+            <layout>
+              <property name="left_attach">3</property>
+              <property name="top_attach">22</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">3</property>
-            <property name="top_attach">22</property>
-          </packing>
         </child>
         <child>
           <object class="GtkPaned" id="paned22">
-            <property name="shrink-child2">False</property>
-            <property name="resize-child2">True</property>
-            <property name="shrink-child1">False</property>
-            <property name="resize-child1">False</property>
+            <property name="shrink-child2">0</property>
+            <property name="shrink-child1">0</property>
+            <property name="resize-child1">0</property>
             <property name="can_focus">1</property>
             <child>
               <object class="GtkPaned" id="required22">
-                <property name="shrink-child2">False</property>
-                <property name="resize-child2">True</property>
-                <property name="shrink-child1">False</property>
-                <property name="resize-child1">False</property>
+                <property name="shrink-child2">0</property>
+                <property name="shrink-child1">0</property>
+                <property name="resize-child1">0</property>
                 <property name="can_focus">1</property>
                 <property name="orientation">vertical</property>
                 <child>
@@ -2660,10 +2596,9 @@
             </child>
             <child>
               <object class="GtkPaned" id="natural22">
-                <property name="shrink-child2">False</property>
-                <property name="resize-child2">True</property>
-                <property name="shrink-child1">False</property>
-                <property name="resize-child1">False</property>
+                <property name="shrink-child2">0</property>
+                <property name="shrink-child1">0</property>
+                <property name="resize-child1">0</property>
                 <property name="can_focus">1</property>
                 <property name="orientation">vertical</property>
                 <child>
@@ -2696,61 +2631,59 @@
                 </child>
               </object>
             </child>
+            <layout>
+              <property name="left_attach">4</property>
+              <property name="top_attach">22</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">4</property>
-            <property name="top_attach">22</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="wrap23">
             <property name="label" translatable="yes">False</property>
+            <layout>
+              <property name="left_attach">0</property>
+              <property name="top_attach">23</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">0</property>
-            <property name="top_attach">23</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="ellipsize23">
             <property name="label" translatable="yes">end</property>
+            <layout>
+              <property name="left_attach">1</property>
+              <property name="top_attach">23</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">1</property>
-            <property name="top_attach">23</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="width_chars23">
             <property name="label" translatable="yes">4</property>
+            <layout>
+              <property name="left_attach">2</property>
+              <property name="top_attach">23</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">2</property>
-            <property name="top_attach">23</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="max_width_chars23">
             <property name="label" translatable="yes">4</property>
+            <layout>
+              <property name="left_attach">3</property>
+              <property name="top_attach">23</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">3</property>
-            <property name="top_attach">23</property>
-          </packing>
         </child>
         <child>
           <object class="GtkPaned" id="paned23">
-            <property name="shrink-child2">False</property>
-            <property name="resize-child2">True</property>
-            <property name="shrink-child1">False</property>
-            <property name="resize-child1">False</property>
+            <property name="shrink-child2">0</property>
+            <property name="shrink-child1">0</property>
+            <property name="resize-child1">0</property>
             <property name="can_focus">1</property>
             <child>
               <object class="GtkPaned" id="required23">
-                <property name="shrink-child2">False</property>
-                <property name="resize-child2">True</property>
-                <property name="shrink-child1">False</property>
-                <property name="resize-child1">False</property>
+                <property name="shrink-child2">0</property>
+                <property name="shrink-child1">0</property>
+                <property name="resize-child1">0</property>
                 <property name="can_focus">1</property>
                 <property name="orientation">vertical</property>
                 <child>
@@ -2785,10 +2718,9 @@
             </child>
             <child>
               <object class="GtkPaned" id="natural23">
-                <property name="shrink-child2">False</property>
-                <property name="resize-child2">True</property>
-                <property name="shrink-child1">False</property>
-                <property name="resize-child1">False</property>
+                <property name="shrink-child2">0</property>
+                <property name="shrink-child1">0</property>
+                <property name="resize-child1">0</property>
                 <property name="can_focus">1</property>
                 <property name="orientation">vertical</property>
                 <child>
@@ -2821,61 +2753,59 @@
                 </child>
               </object>
             </child>
+            <layout>
+              <property name="left_attach">4</property>
+              <property name="top_attach">23</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">4</property>
-            <property name="top_attach">23</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="wrap24">
             <property name="label" translatable="yes">True</property>
+            <layout>
+              <property name="left_attach">0</property>
+              <property name="top_attach">24</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">0</property>
-            <property name="top_attach">24</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="ellipsize24">
             <property name="label" translatable="yes">end</property>
+            <layout>
+              <property name="left_attach">1</property>
+              <property name="top_attach">24</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">1</property>
-            <property name="top_attach">24</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="width_chars24">
             <property name="label" translatable="yes">4</property>
+            <layout>
+              <property name="left_attach">2</property>
+              <property name="top_attach">24</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">2</property>
-            <property name="top_attach">24</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="max_width_chars24">
             <property name="label" translatable="yes">4</property>
+            <layout>
+              <property name="left_attach">3</property>
+              <property name="top_attach">24</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">3</property>
-            <property name="top_attach">24</property>
-          </packing>
         </child>
         <child>
           <object class="GtkPaned" id="paned24">
-            <property name="shrink-child2">False</property>
-            <property name="resize-child2">True</property>
-            <property name="shrink-child1">False</property>
-            <property name="resize-child1">False</property>
+            <property name="shrink-child2">0</property>
+            <property name="shrink-child1">0</property>
+            <property name="resize-child1">0</property>
             <property name="can_focus">1</property>
             <child>
               <object class="GtkPaned" id="required24">
-                <property name="shrink-child2">False</property>
-                <property name="resize-child2">True</property>
-                <property name="shrink-child1">False</property>
-                <property name="resize-child1">False</property>
+                <property name="shrink-child2">0</property>
+                <property name="shrink-child1">0</property>
+                <property name="resize-child1">0</property>
                 <property name="can_focus">1</property>
                 <property name="orientation">vertical</property>
                 <child>
@@ -2912,10 +2842,9 @@
             </child>
             <child>
               <object class="GtkPaned" id="natural24">
-                <property name="shrink-child2">False</property>
-                <property name="resize-child2">True</property>
-                <property name="shrink-child1">False</property>
-                <property name="resize-child1">False</property>
+                <property name="shrink-child2">0</property>
+                <property name="shrink-child1">0</property>
+                <property name="resize-child1">0</property>
                 <property name="can_focus">1</property>
                 <property name="orientation">vertical</property>
                 <child>
@@ -2950,61 +2879,59 @@
                 </child>
               </object>
             </child>
+            <layout>
+              <property name="left_attach">4</property>
+              <property name="top_attach">24</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">4</property>
-            <property name="top_attach">24</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="wrap25">
             <property name="label" translatable="yes">False</property>
+            <layout>
+              <property name="left_attach">0</property>
+              <property name="top_attach">25</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">0</property>
-            <property name="top_attach">25</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="ellipsize25">
             <property name="label" translatable="yes">none</property>
+            <layout>
+              <property name="left_attach">1</property>
+              <property name="top_attach">25</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">1</property>
-            <property name="top_attach">25</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="width_chars25">
             <property name="label" translatable="yes">8</property>
+            <layout>
+              <property name="left_attach">2</property>
+              <property name="top_attach">25</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">2</property>
-            <property name="top_attach">25</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="max_width_chars25">
             <property name="label" translatable="yes">4</property>
+            <layout>
+              <property name="left_attach">3</property>
+              <property name="top_attach">25</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">3</property>
-            <property name="top_attach">25</property>
-          </packing>
         </child>
         <child>
           <object class="GtkPaned" id="paned25">
-            <property name="shrink-child2">False</property>
-            <property name="resize-child2">True</property>
-            <property name="shrink-child1">False</property>
-            <property name="resize-child1">False</property>
+            <property name="shrink-child2">0</property>
+            <property name="shrink-child1">0</property>
+            <property name="resize-child1">0</property>
             <property name="can_focus">1</property>
             <child>
               <object class="GtkPaned" id="required25">
-                <property name="shrink-child2">False</property>
-                <property name="resize-child2">True</property>
-                <property name="shrink-child1">False</property>
-                <property name="resize-child1">False</property>
+                <property name="shrink-child2">0</property>
+                <property name="shrink-child1">0</property>
+                <property name="resize-child1">0</property>
                 <property name="can_focus">1</property>
                 <property name="orientation">vertical</property>
                 <child>
@@ -3037,10 +2964,9 @@
             </child>
             <child>
               <object class="GtkPaned" id="natural25">
-                <property name="shrink-child2">False</property>
-                <property name="resize-child2">True</property>
-                <property name="shrink-child1">False</property>
-                <property name="resize-child1">False</property>
+                <property name="shrink-child2">0</property>
+                <property name="shrink-child1">0</property>
+                <property name="resize-child1">0</property>
                 <property name="can_focus">1</property>
                 <property name="orientation">vertical</property>
                 <child>
@@ -3071,61 +2997,59 @@
                 </child>
               </object>
             </child>
+            <layout>
+              <property name="left_attach">4</property>
+              <property name="top_attach">25</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">4</property>
-            <property name="top_attach">25</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="wrap26">
             <property name="label" translatable="yes">True</property>
+            <layout>
+              <property name="left_attach">0</property>
+              <property name="top_attach">26</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">0</property>
-            <property name="top_attach">26</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="ellipsize26">
             <property name="label" translatable="yes">none</property>
+            <layout>
+              <property name="left_attach">1</property>
+              <property name="top_attach">26</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">1</property>
-            <property name="top_attach">26</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="width_chars26">
             <property name="label" translatable="yes">8</property>
+            <layout>
+              <property name="left_attach">2</property>
+              <property name="top_attach">26</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">2</property>
-            <property name="top_attach">26</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="max_width_chars26">
             <property name="label" translatable="yes">4</property>
+            <layout>
+              <property name="left_attach">3</property>
+              <property name="top_attach">26</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">3</property>
-            <property name="top_attach">26</property>
-          </packing>
         </child>
         <child>
           <object class="GtkPaned" id="paned26">
-            <property name="shrink-child2">False</property>
-            <property name="resize-child2">True</property>
-            <property name="shrink-child1">False</property>
-            <property name="resize-child1">False</property>
+            <property name="shrink-child2">0</property>
+            <property name="shrink-child1">0</property>
+            <property name="resize-child1">0</property>
             <property name="can_focus">1</property>
             <child>
               <object class="GtkPaned" id="required26">
-                <property name="shrink-child2">False</property>
-                <property name="resize-child2">True</property>
-                <property name="shrink-child1">False</property>
-                <property name="resize-child1">False</property>
+                <property name="shrink-child2">0</property>
+                <property name="shrink-child1">0</property>
+                <property name="resize-child1">0</property>
                 <property name="can_focus">1</property>
                 <property name="orientation">vertical</property>
                 <child>
@@ -3160,10 +3084,9 @@
             </child>
             <child>
               <object class="GtkPaned" id="natural26">
-                <property name="shrink-child2">False</property>
-                <property name="resize-child2">True</property>
-                <property name="shrink-child1">False</property>
-                <property name="resize-child1">False</property>
+                <property name="shrink-child2">0</property>
+                <property name="shrink-child1">0</property>
+                <property name="resize-child1">0</property>
                 <property name="can_focus">1</property>
                 <property name="orientation">vertical</property>
                 <child>
@@ -3196,61 +3119,59 @@
                 </child>
               </object>
             </child>
+            <layout>
+              <property name="left_attach">4</property>
+              <property name="top_attach">26</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">4</property>
-            <property name="top_attach">26</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="wrap27">
             <property name="label" translatable="yes">False</property>
+            <layout>
+              <property name="left_attach">0</property>
+              <property name="top_attach">27</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">0</property>
-            <property name="top_attach">27</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="ellipsize27">
             <property name="label" translatable="yes">end</property>
+            <layout>
+              <property name="left_attach">1</property>
+              <property name="top_attach">27</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">1</property>
-            <property name="top_attach">27</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="width_chars27">
             <property name="label" translatable="yes">8</property>
+            <layout>
+              <property name="left_attach">2</property>
+              <property name="top_attach">27</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">2</property>
-            <property name="top_attach">27</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="max_width_chars27">
             <property name="label" translatable="yes">4</property>
+            <layout>
+              <property name="left_attach">3</property>
+              <property name="top_attach">27</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">3</property>
-            <property name="top_attach">27</property>
-          </packing>
         </child>
         <child>
           <object class="GtkPaned" id="paned27">
-            <property name="shrink-child2">False</property>
-            <property name="resize-child2">True</property>
-            <property name="shrink-child1">False</property>
-            <property name="resize-child1">False</property>
+            <property name="shrink-child2">0</property>
+            <property name="shrink-child1">0</property>
+            <property name="resize-child1">0</property>
             <property name="can_focus">1</property>
             <child>
               <object class="GtkPaned" id="required27">
-                <property name="shrink-child2">False</property>
-                <property name="resize-child2">True</property>
-                <property name="shrink-child1">False</property>
-                <property name="resize-child1">False</property>
+                <property name="shrink-child2">0</property>
+                <property name="shrink-child1">0</property>
+                <property name="resize-child1">0</property>
                 <property name="can_focus">1</property>
                 <property name="orientation">vertical</property>
                 <child>
@@ -3285,10 +3206,9 @@
             </child>
             <child>
               <object class="GtkPaned" id="natural27">
-                <property name="shrink-child2">False</property>
-                <property name="resize-child2">True</property>
-                <property name="shrink-child1">False</property>
-                <property name="resize-child1">False</property>
+                <property name="shrink-child2">0</property>
+                <property name="shrink-child1">0</property>
+                <property name="resize-child1">0</property>
                 <property name="can_focus">1</property>
                 <property name="orientation">vertical</property>
                 <child>
@@ -3321,61 +3241,59 @@
                 </child>
               </object>
             </child>
+            <layout>
+              <property name="left_attach">4</property>
+              <property name="top_attach">27</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">4</property>
-            <property name="top_attach">27</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="wrap28">
             <property name="label" translatable="yes">True</property>
+            <layout>
+              <property name="left_attach">0</property>
+              <property name="top_attach">28</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">0</property>
-            <property name="top_attach">28</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="ellipsize28">
             <property name="label" translatable="yes">end</property>
+            <layout>
+              <property name="left_attach">1</property>
+              <property name="top_attach">28</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">1</property>
-            <property name="top_attach">28</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="width_chars28">
             <property name="label" translatable="yes">8</property>
+            <layout>
+              <property name="left_attach">2</property>
+              <property name="top_attach">28</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">2</property>
-            <property name="top_attach">28</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="max_width_chars28">
             <property name="label" translatable="yes">4</property>
+            <layout>
+              <property name="left_attach">3</property>
+              <property name="top_attach">28</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">3</property>
-            <property name="top_attach">28</property>
-          </packing>
         </child>
         <child>
           <object class="GtkPaned" id="paned28">
-            <property name="shrink-child2">False</property>
-            <property name="resize-child2">True</property>
-            <property name="shrink-child1">False</property>
-            <property name="resize-child1">False</property>
+            <property name="shrink-child2">0</property>
+            <property name="shrink-child1">0</property>
+            <property name="resize-child1">0</property>
             <property name="can_focus">1</property>
             <child>
               <object class="GtkPaned" id="required28">
-                <property name="shrink-child2">False</property>
-                <property name="resize-child2">True</property>
-                <property name="shrink-child1">False</property>
-                <property name="resize-child1">False</property>
+                <property name="shrink-child2">0</property>
+                <property name="shrink-child1">0</property>
+                <property name="resize-child1">0</property>
                 <property name="can_focus">1</property>
                 <property name="orientation">vertical</property>
                 <child>
@@ -3412,10 +3330,9 @@
             </child>
             <child>
               <object class="GtkPaned" id="natural28">
-                <property name="shrink-child2">False</property>
-                <property name="resize-child2">True</property>
-                <property name="shrink-child1">False</property>
-                <property name="resize-child1">False</property>
+                <property name="shrink-child2">0</property>
+                <property name="shrink-child1">0</property>
+                <property name="resize-child1">0</property>
                 <property name="can_focus">1</property>
                 <property name="orientation">vertical</property>
                 <child>
@@ -3450,61 +3367,59 @@
                 </child>
               </object>
             </child>
+            <layout>
+              <property name="left_attach">4</property>
+              <property name="top_attach">28</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">4</property>
-            <property name="top_attach">28</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="wrap29">
             <property name="label" translatable="yes">False</property>
+            <layout>
+              <property name="left_attach">0</property>
+              <property name="top_attach">29</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">0</property>
-            <property name="top_attach">29</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="ellipsize29">
             <property name="label" translatable="yes">none</property>
+            <layout>
+              <property name="left_attach">1</property>
+              <property name="top_attach">29</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">1</property>
-            <property name="top_attach">29</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="width_chars29">
             <property name="label" translatable="yes">12</property>
+            <layout>
+              <property name="left_attach">2</property>
+              <property name="top_attach">29</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">2</property>
-            <property name="top_attach">29</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="max_width_chars29">
             <property name="label" translatable="yes">4</property>
+            <layout>
+              <property name="left_attach">3</property>
+              <property name="top_attach">29</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">3</property>
-            <property name="top_attach">29</property>
-          </packing>
         </child>
         <child>
           <object class="GtkPaned" id="paned29">
-            <property name="shrink-child2">False</property>
-            <property name="resize-child2">True</property>
-            <property name="shrink-child1">False</property>
-            <property name="resize-child1">False</property>
+            <property name="shrink-child2">0</property>
+            <property name="shrink-child1">0</property>
+            <property name="resize-child1">0</property>
             <property name="can_focus">1</property>
             <child>
               <object class="GtkPaned" id="required29">
-                <property name="shrink-child2">False</property>
-                <property name="resize-child2">True</property>
-                <property name="shrink-child1">False</property>
-                <property name="resize-child1">False</property>
+                <property name="shrink-child2">0</property>
+                <property name="shrink-child1">0</property>
+                <property name="resize-child1">0</property>
                 <property name="can_focus">1</property>
                 <property name="orientation">vertical</property>
                 <child>
@@ -3537,10 +3452,9 @@
             </child>
             <child>
               <object class="GtkPaned" id="natural29">
-                <property name="shrink-child2">False</property>
-                <property name="resize-child2">True</property>
-                <property name="shrink-child1">False</property>
-                <property name="resize-child1">False</property>
+                <property name="shrink-child2">0</property>
+                <property name="shrink-child1">0</property>
+                <property name="resize-child1">0</property>
                 <property name="can_focus">1</property>
                 <property name="orientation">vertical</property>
                 <child>
@@ -3571,61 +3485,59 @@
                 </child>
               </object>
             </child>
+            <layout>
+              <property name="left_attach">4</property>
+              <property name="top_attach">29</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">4</property>
-            <property name="top_attach">29</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="wrap30">
             <property name="label" translatable="yes">True</property>
+            <layout>
+              <property name="left_attach">0</property>
+              <property name="top_attach">30</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">0</property>
-            <property name="top_attach">30</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="ellipsize30">
             <property name="label" translatable="yes">none</property>
+            <layout>
+              <property name="left_attach">1</property>
+              <property name="top_attach">30</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">1</property>
-            <property name="top_attach">30</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="width_chars30">
             <property name="label" translatable="yes">12</property>
+            <layout>
+              <property name="left_attach">2</property>
+              <property name="top_attach">30</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">2</property>
-            <property name="top_attach">30</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="max_width_chars30">
             <property name="label" translatable="yes">4</property>
+            <layout>
+              <property name="left_attach">3</property>
+              <property name="top_attach">30</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">3</property>
-            <property name="top_attach">30</property>
-          </packing>
         </child>
         <child>
           <object class="GtkPaned" id="paned30">
-            <property name="shrink-child2">False</property>
-            <property name="resize-child2">True</property>
-            <property name="shrink-child1">False</property>
-            <property name="resize-child1">False</property>
+            <property name="shrink-child2">0</property>
+            <property name="shrink-child1">0</property>
+            <property name="resize-child1">0</property>
             <property name="can_focus">1</property>
             <child>
               <object class="GtkPaned" id="required30">
-                <property name="shrink-child2">False</property>
-                <property name="resize-child2">True</property>
-                <property name="shrink-child1">False</property>
-                <property name="resize-child1">False</property>
+                <property name="shrink-child2">0</property>
+                <property name="shrink-child1">0</property>
+                <property name="resize-child1">0</property>
                 <property name="can_focus">1</property>
                 <property name="orientation">vertical</property>
                 <child>
@@ -3660,10 +3572,9 @@
             </child>
             <child>
               <object class="GtkPaned" id="natural30">
-                <property name="shrink-child2">False</property>
-                <property name="resize-child2">True</property>
-                <property name="shrink-child1">False</property>
-                <property name="resize-child1">False</property>
+                <property name="shrink-child2">0</property>
+                <property name="shrink-child1">0</property>
+                <property name="resize-child1">0</property>
                 <property name="can_focus">1</property>
                 <property name="orientation">vertical</property>
                 <child>
@@ -3696,61 +3607,59 @@
                 </child>
               </object>
             </child>
+            <layout>
+              <property name="left_attach">4</property>
+              <property name="top_attach">30</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">4</property>
-            <property name="top_attach">30</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="wrap31">
             <property name="label" translatable="yes">False</property>
+            <layout>
+              <property name="left_attach">0</property>
+              <property name="top_attach">31</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">0</property>
-            <property name="top_attach">31</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="ellipsize31">
             <property name="label" translatable="yes">end</property>
+            <layout>
+              <property name="left_attach">1</property>
+              <property name="top_attach">31</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">1</property>
-            <property name="top_attach">31</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="width_chars31">
             <property name="label" translatable="yes">12</property>
+            <layout>
+              <property name="left_attach">2</property>
+              <property name="top_attach">31</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">2</property>
-            <property name="top_attach">31</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="max_width_chars31">
             <property name="label" translatable="yes">4</property>
+            <layout>
+              <property name="left_attach">3</property>
+              <property name="top_attach">31</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">3</property>
-            <property name="top_attach">31</property>
-          </packing>
         </child>
         <child>
           <object class="GtkPaned" id="paned31">
-            <property name="shrink-child2">False</property>
-            <property name="resize-child2">True</property>
-            <property name="shrink-child1">False</property>
-            <property name="resize-child1">False</property>
+            <property name="shrink-child2">0</property>
+            <property name="shrink-child1">0</property>
+            <property name="resize-child1">0</property>
             <property name="can_focus">1</property>
             <child>
               <object class="GtkPaned" id="required31">
-                <property name="shrink-child2">False</property>
-                <property name="resize-child2">True</property>
-                <property name="shrink-child1">False</property>
-                <property name="resize-child1">False</property>
+                <property name="shrink-child2">0</property>
+                <property name="shrink-child1">0</property>
+                <property name="resize-child1">0</property>
                 <property name="can_focus">1</property>
                 <property name="orientation">vertical</property>
                 <child>
@@ -3785,10 +3694,9 @@
             </child>
             <child>
               <object class="GtkPaned" id="natural31">
-                <property name="shrink-child2">False</property>
-                <property name="resize-child2">True</property>
-                <property name="shrink-child1">False</property>
-                <property name="resize-child1">False</property>
+                <property name="shrink-child2">0</property>
+                <property name="shrink-child1">0</property>
+                <property name="resize-child1">0</property>
                 <property name="can_focus">1</property>
                 <property name="orientation">vertical</property>
                 <child>
@@ -3821,61 +3729,59 @@
                 </child>
               </object>
             </child>
+            <layout>
+              <property name="left_attach">4</property>
+              <property name="top_attach">31</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">4</property>
-            <property name="top_attach">31</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="wrap32">
             <property name="label" translatable="yes">True</property>
+            <layout>
+              <property name="left_attach">0</property>
+              <property name="top_attach">32</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">0</property>
-            <property name="top_attach">32</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="ellipsize32">
             <property name="label" translatable="yes">end</property>
+            <layout>
+              <property name="left_attach">1</property>
+              <property name="top_attach">32</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">1</property>
-            <property name="top_attach">32</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="width_chars32">
             <property name="label" translatable="yes">12</property>
+            <layout>
+              <property name="left_attach">2</property>
+              <property name="top_attach">32</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">2</property>
-            <property name="top_attach">32</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="max_width_chars32">
             <property name="label" translatable="yes">4</property>
+            <layout>
+              <property name="left_attach">3</property>
+              <property name="top_attach">32</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">3</property>
-            <property name="top_attach">32</property>
-          </packing>
         </child>
         <child>
           <object class="GtkPaned" id="paned32">
-            <property name="shrink-child2">False</property>
-            <property name="resize-child2">True</property>
-            <property name="shrink-child1">False</property>
-            <property name="resize-child1">False</property>
+            <property name="shrink-child2">0</property>
+            <property name="shrink-child1">0</property>
+            <property name="resize-child1">0</property>
             <property name="can_focus">1</property>
             <child>
               <object class="GtkPaned" id="required32">
-                <property name="shrink-child2">False</property>
-                <property name="resize-child2">True</property>
-                <property name="shrink-child1">False</property>
-                <property name="resize-child1">False</property>
+                <property name="shrink-child2">0</property>
+                <property name="shrink-child1">0</property>
+                <property name="resize-child1">0</property>
                 <property name="can_focus">1</property>
                 <property name="orientation">vertical</property>
                 <child>
@@ -3912,10 +3818,9 @@
             </child>
             <child>
               <object class="GtkPaned" id="natural32">
-                <property name="shrink-child2">False</property>
-                <property name="resize-child2">True</property>
-                <property name="shrink-child1">False</property>
-                <property name="resize-child1">False</property>
+                <property name="shrink-child2">0</property>
+                <property name="shrink-child1">0</property>
+                <property name="resize-child1">0</property>
                 <property name="can_focus">1</property>
                 <property name="orientation">vertical</property>
                 <child>
@@ -3950,61 +3855,59 @@
                 </child>
               </object>
             </child>
+            <layout>
+              <property name="left_attach">4</property>
+              <property name="top_attach">32</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">4</property>
-            <property name="top_attach">32</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="wrap33">
             <property name="label" translatable="yes">False</property>
+            <layout>
+              <property name="left_attach">0</property>
+              <property name="top_attach">33</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">0</property>
-            <property name="top_attach">33</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="ellipsize33">
             <property name="label" translatable="yes">none</property>
+            <layout>
+              <property name="left_attach">1</property>
+              <property name="top_attach">33</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">1</property>
-            <property name="top_attach">33</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="width_chars33">
             <property name="label" translatable="yes">-1</property>
+            <layout>
+              <property name="left_attach">2</property>
+              <property name="top_attach">33</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">2</property>
-            <property name="top_attach">33</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="max_width_chars33">
             <property name="label" translatable="yes">8</property>
+            <layout>
+              <property name="left_attach">3</property>
+              <property name="top_attach">33</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">3</property>
-            <property name="top_attach">33</property>
-          </packing>
         </child>
         <child>
           <object class="GtkPaned" id="paned33">
-            <property name="shrink-child2">False</property>
-            <property name="resize-child2">True</property>
-            <property name="shrink-child1">False</property>
-            <property name="resize-child1">False</property>
+            <property name="shrink-child2">0</property>
+            <property name="shrink-child1">0</property>
+            <property name="resize-child1">0</property>
             <property name="can_focus">1</property>
             <child>
               <object class="GtkPaned" id="required33">
-                <property name="shrink-child2">False</property>
-                <property name="resize-child2">True</property>
-                <property name="shrink-child1">False</property>
-                <property name="resize-child1">False</property>
+                <property name="shrink-child2">0</property>
+                <property name="shrink-child1">0</property>
+                <property name="resize-child1">0</property>
                 <property name="can_focus">1</property>
                 <property name="orientation">vertical</property>
                 <child>
@@ -4035,10 +3938,9 @@
             </child>
             <child>
               <object class="GtkPaned" id="natural33">
-                <property name="shrink-child2">False</property>
-                <property name="resize-child2">True</property>
-                <property name="shrink-child1">False</property>
-                <property name="resize-child1">False</property>
+                <property name="shrink-child2">0</property>
+                <property name="shrink-child1">0</property>
+                <property name="resize-child1">0</property>
                 <property name="can_focus">1</property>
                 <property name="orientation">vertical</property>
                 <child>
@@ -4067,61 +3969,59 @@
                 </child>
               </object>
             </child>
+            <layout>
+              <property name="left_attach">4</property>
+              <property name="top_attach">33</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">4</property>
-            <property name="top_attach">33</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="wrap34">
             <property name="label" translatable="yes">True</property>
+            <layout>
+              <property name="left_attach">0</property>
+              <property name="top_attach">34</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">0</property>
-            <property name="top_attach">34</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="ellipsize34">
             <property name="label" translatable="yes">none</property>
+            <layout>
+              <property name="left_attach">1</property>
+              <property name="top_attach">34</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">1</property>
-            <property name="top_attach">34</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="width_chars34">
             <property name="label" translatable="yes">-1</property>
+            <layout>
+              <property name="left_attach">2</property>
+              <property name="top_attach">34</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">2</property>
-            <property name="top_attach">34</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="max_width_chars34">
             <property name="label" translatable="yes">8</property>
+            <layout>
+              <property name="left_attach">3</property>
+              <property name="top_attach">34</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">3</property>
-            <property name="top_attach">34</property>
-          </packing>
         </child>
         <child>
           <object class="GtkPaned" id="paned34">
-            <property name="shrink-child2">False</property>
-            <property name="resize-child2">True</property>
-            <property name="shrink-child1">False</property>
-            <property name="resize-child1">False</property>
+            <property name="shrink-child2">0</property>
+            <property name="shrink-child1">0</property>
+            <property name="resize-child1">0</property>
             <property name="can_focus">1</property>
             <child>
               <object class="GtkPaned" id="required34">
-                <property name="shrink-child2">False</property>
-                <property name="resize-child2">True</property>
-                <property name="shrink-child1">False</property>
-                <property name="resize-child1">False</property>
+                <property name="shrink-child2">0</property>
+                <property name="shrink-child1">0</property>
+                <property name="resize-child1">0</property>
                 <property name="can_focus">1</property>
                 <property name="orientation">vertical</property>
                 <child>
@@ -4154,10 +4054,9 @@
             </child>
             <child>
               <object class="GtkPaned" id="natural34">
-                <property name="shrink-child2">False</property>
-                <property name="resize-child2">True</property>
-                <property name="shrink-child1">False</property>
-                <property name="resize-child1">False</property>
+                <property name="shrink-child2">0</property>
+                <property name="shrink-child1">0</property>
+                <property name="resize-child1">0</property>
                 <property name="can_focus">1</property>
                 <property name="orientation">vertical</property>
                 <child>
@@ -4188,61 +4087,59 @@
                 </child>
               </object>
             </child>
+            <layout>
+              <property name="left_attach">4</property>
+              <property name="top_attach">34</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">4</property>
-            <property name="top_attach">34</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="wrap35">
             <property name="label" translatable="yes">False</property>
+            <layout>
+              <property name="left_attach">0</property>
+              <property name="top_attach">35</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">0</property>
-            <property name="top_attach">35</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="ellipsize35">
             <property name="label" translatable="yes">end</property>
+            <layout>
+              <property name="left_attach">1</property>
+              <property name="top_attach">35</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">1</property>
-            <property name="top_attach">35</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="width_chars35">
             <property name="label" translatable="yes">-1</property>
+            <layout>
+              <property name="left_attach">2</property>
+              <property name="top_attach">35</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">2</property>
-            <property name="top_attach">35</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="max_width_chars35">
             <property name="label" translatable="yes">8</property>
+            <layout>
+              <property name="left_attach">3</property>
+              <property name="top_attach">35</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">3</property>
-            <property name="top_attach">35</property>
-          </packing>
         </child>
         <child>
           <object class="GtkPaned" id="paned35">
-            <property name="shrink-child2">False</property>
-            <property name="resize-child2">True</property>
-            <property name="shrink-child1">False</property>
-            <property name="resize-child1">False</property>
+            <property name="shrink-child2">0</property>
+            <property name="shrink-child1">0</property>
+            <property name="resize-child1">0</property>
             <property name="can_focus">1</property>
             <child>
               <object class="GtkPaned" id="required35">
-                <property name="shrink-child2">False</property>
-                <property name="resize-child2">True</property>
-                <property name="shrink-child1">False</property>
-                <property name="resize-child1">False</property>
+                <property name="shrink-child2">0</property>
+                <property name="shrink-child1">0</property>
+                <property name="resize-child1">0</property>
                 <property name="can_focus">1</property>
                 <property name="orientation">vertical</property>
                 <child>
@@ -4275,10 +4172,9 @@
             </child>
             <child>
               <object class="GtkPaned" id="natural35">
-                <property name="shrink-child2">False</property>
-                <property name="resize-child2">True</property>
-                <property name="shrink-child1">False</property>
-                <property name="resize-child1">False</property>
+                <property name="shrink-child2">0</property>
+                <property name="shrink-child1">0</property>
+                <property name="resize-child1">0</property>
                 <property name="can_focus">1</property>
                 <property name="orientation">vertical</property>
                 <child>
@@ -4309,61 +4205,59 @@
                 </child>
               </object>
             </child>
+            <layout>
+              <property name="left_attach">4</property>
+              <property name="top_attach">35</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">4</property>
-            <property name="top_attach">35</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="wrap36">
             <property name="label" translatable="yes">True</property>
+            <layout>
+              <property name="left_attach">0</property>
+              <property name="top_attach">36</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">0</property>
-            <property name="top_attach">36</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="ellipsize36">
             <property name="label" translatable="yes">end</property>
+            <layout>
+              <property name="left_attach">1</property>
+              <property name="top_attach">36</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">1</property>
-            <property name="top_attach">36</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="width_chars36">
             <property name="label" translatable="yes">-1</property>
+            <layout>
+              <property name="left_attach">2</property>
+              <property name="top_attach">36</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">2</property>
-            <property name="top_attach">36</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="max_width_chars36">
             <property name="label" translatable="yes">8</property>
+            <layout>
+              <property name="left_attach">3</property>
+              <property name="top_attach">36</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">3</property>
-            <property name="top_attach">36</property>
-          </packing>
         </child>
         <child>
           <object class="GtkPaned" id="paned36">
-            <property name="shrink-child2">False</property>
-            <property name="resize-child2">True</property>
-            <property name="shrink-child1">False</property>
-            <property name="resize-child1">False</property>
+            <property name="shrink-child2">0</property>
+            <property name="shrink-child1">0</property>
+            <property name="resize-child1">0</property>
             <property name="can_focus">1</property>
             <child>
               <object class="GtkPaned" id="required36">
-                <property name="shrink-child2">False</property>
-                <property name="resize-child2">True</property>
-                <property name="shrink-child1">False</property>
-                <property name="resize-child1">False</property>
+                <property name="shrink-child2">0</property>
+                <property name="shrink-child1">0</property>
+                <property name="resize-child1">0</property>
                 <property name="can_focus">1</property>
                 <property name="orientation">vertical</property>
                 <child>
@@ -4398,10 +4292,9 @@
             </child>
             <child>
               <object class="GtkPaned" id="natural36">
-                <property name="shrink-child2">False</property>
-                <property name="resize-child2">True</property>
-                <property name="shrink-child1">False</property>
-                <property name="resize-child1">False</property>
+                <property name="shrink-child2">0</property>
+                <property name="shrink-child1">0</property>
+                <property name="resize-child1">0</property>
                 <property name="can_focus">1</property>
                 <property name="orientation">vertical</property>
                 <child>
@@ -4434,61 +4327,59 @@
                 </child>
               </object>
             </child>
+            <layout>
+              <property name="left_attach">4</property>
+              <property name="top_attach">36</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">4</property>
-            <property name="top_attach">36</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="wrap37">
             <property name="label" translatable="yes">False</property>
+            <layout>
+              <property name="left_attach">0</property>
+              <property name="top_attach">37</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">0</property>
-            <property name="top_attach">37</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="ellipsize37">
             <property name="label" translatable="yes">none</property>
+            <layout>
+              <property name="left_attach">1</property>
+              <property name="top_attach">37</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">1</property>
-            <property name="top_attach">37</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="width_chars37">
             <property name="label" translatable="yes">4</property>
+            <layout>
+              <property name="left_attach">2</property>
+              <property name="top_attach">37</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">2</property>
-            <property name="top_attach">37</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="max_width_chars37">
             <property name="label" translatable="yes">8</property>
+            <layout>
+              <property name="left_attach">3</property>
+              <property name="top_attach">37</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">3</property>
-            <property name="top_attach">37</property>
-          </packing>
         </child>
         <child>
           <object class="GtkPaned" id="paned37">
-            <property name="shrink-child2">False</property>
-            <property name="resize-child2">True</property>
-            <property name="shrink-child1">False</property>
-            <property name="resize-child1">False</property>
+            <property name="shrink-child2">0</property>
+            <property name="shrink-child1">0</property>
+            <property name="resize-child1">0</property>
             <property name="can_focus">1</property>
             <child>
               <object class="GtkPaned" id="required37">
-                <property name="shrink-child2">False</property>
-                <property name="resize-child2">True</property>
-                <property name="shrink-child1">False</property>
-                <property name="resize-child1">False</property>
+                <property name="shrink-child2">0</property>
+                <property name="shrink-child1">0</property>
+                <property name="resize-child1">0</property>
                 <property name="can_focus">1</property>
                 <property name="orientation">vertical</property>
                 <child>
@@ -4521,10 +4412,9 @@
             </child>
             <child>
               <object class="GtkPaned" id="natural37">
-                <property name="shrink-child2">False</property>
-                <property name="resize-child2">True</property>
-                <property name="shrink-child1">False</property>
-                <property name="resize-child1">False</property>
+                <property name="shrink-child2">0</property>
+                <property name="shrink-child1">0</property>
+                <property name="resize-child1">0</property>
                 <property name="can_focus">1</property>
                 <property name="orientation">vertical</property>
                 <child>
@@ -4555,61 +4445,59 @@
                 </child>
               </object>
             </child>
+            <layout>
+              <property name="left_attach">4</property>
+              <property name="top_attach">37</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">4</property>
-            <property name="top_attach">37</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="wrap38">
             <property name="label" translatable="yes">True</property>
+            <layout>
+              <property name="left_attach">0</property>
+              <property name="top_attach">38</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">0</property>
-            <property name="top_attach">38</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="ellipsize38">
             <property name="label" translatable="yes">none</property>
+            <layout>
+              <property name="left_attach">1</property>
+              <property name="top_attach">38</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">1</property>
-            <property name="top_attach">38</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="width_chars38">
             <property name="label" translatable="yes">4</property>
+            <layout>
+              <property name="left_attach">2</property>
+              <property name="top_attach">38</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">2</property>
-            <property name="top_attach">38</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="max_width_chars38">
             <property name="label" translatable="yes">8</property>
+            <layout>
+              <property name="left_attach">3</property>
+              <property name="top_attach">38</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">3</property>
-            <property name="top_attach">38</property>
-          </packing>
         </child>
         <child>
           <object class="GtkPaned" id="paned38">
-            <property name="shrink-child2">False</property>
-            <property name="resize-child2">True</property>
-            <property name="shrink-child1">False</property>
-            <property name="resize-child1">False</property>
+            <property name="shrink-child2">0</property>
+            <property name="shrink-child1">0</property>
+            <property name="resize-child1">0</property>
             <property name="can_focus">1</property>
             <child>
               <object class="GtkPaned" id="required38">
-                <property name="shrink-child2">False</property>
-                <property name="resize-child2">True</property>
-                <property name="shrink-child1">False</property>
-                <property name="resize-child1">False</property>
+                <property name="shrink-child2">0</property>
+                <property name="shrink-child1">0</property>
+                <property name="resize-child1">0</property>
                 <property name="can_focus">1</property>
                 <property name="orientation">vertical</property>
                 <child>
@@ -4644,10 +4532,9 @@
             </child>
             <child>
               <object class="GtkPaned" id="natural38">
-                <property name="shrink-child2">False</property>
-                <property name="resize-child2">True</property>
-                <property name="shrink-child1">False</property>
-                <property name="resize-child1">False</property>
+                <property name="shrink-child2">0</property>
+                <property name="shrink-child1">0</property>
+                <property name="resize-child1">0</property>
                 <property name="can_focus">1</property>
                 <property name="orientation">vertical</property>
                 <child>
@@ -4680,61 +4567,59 @@
                 </child>
               </object>
             </child>
+            <layout>
+              <property name="left_attach">4</property>
+              <property name="top_attach">38</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">4</property>
-            <property name="top_attach">38</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="wrap39">
             <property name="label" translatable="yes">False</property>
+            <layout>
+              <property name="left_attach">0</property>
+              <property name="top_attach">39</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">0</property>
-            <property name="top_attach">39</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="ellipsize39">
             <property name="label" translatable="yes">end</property>
+            <layout>
+              <property name="left_attach">1</property>
+              <property name="top_attach">39</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">1</property>
-            <property name="top_attach">39</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="width_chars39">
             <property name="label" translatable="yes">4</property>
+            <layout>
+              <property name="left_attach">2</property>
+              <property name="top_attach">39</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">2</property>
-            <property name="top_attach">39</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="max_width_chars39">
             <property name="label" translatable="yes">8</property>
+            <layout>
+              <property name="left_attach">3</property>
+              <property name="top_attach">39</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">3</property>
-            <property name="top_attach">39</property>
-          </packing>
         </child>
         <child>
           <object class="GtkPaned" id="paned39">
-            <property name="shrink-child2">False</property>
-            <property name="resize-child2">True</property>
-            <property name="shrink-child1">False</property>
-            <property name="resize-child1">False</property>
+            <property name="shrink-child2">0</property>
+            <property name="shrink-child1">0</property>
+            <property name="resize-child1">0</property>
             <property name="can_focus">1</property>
             <child>
               <object class="GtkPaned" id="required39">
-                <property name="shrink-child2">False</property>
-                <property name="resize-child2">True</property>
-                <property name="shrink-child1">False</property>
-                <property name="resize-child1">False</property>
+                <property name="shrink-child2">0</property>
+                <property name="shrink-child1">0</property>
+                <property name="resize-child1">0</property>
                 <property name="can_focus">1</property>
                 <property name="orientation">vertical</property>
                 <child>
@@ -4769,10 +4654,9 @@
             </child>
             <child>
               <object class="GtkPaned" id="natural39">
-                <property name="shrink-child2">False</property>
-                <property name="resize-child2">True</property>
-                <property name="shrink-child1">False</property>
-                <property name="resize-child1">False</property>
+                <property name="shrink-child2">0</property>
+                <property name="shrink-child1">0</property>
+                <property name="resize-child1">0</property>
                 <property name="can_focus">1</property>
                 <property name="orientation">vertical</property>
                 <child>
@@ -4805,61 +4689,59 @@
                 </child>
               </object>
             </child>
+            <layout>
+              <property name="left_attach">4</property>
+              <property name="top_attach">39</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">4</property>
-            <property name="top_attach">39</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="wrap40">
             <property name="label" translatable="yes">True</property>
+            <layout>
+              <property name="left_attach">0</property>
+              <property name="top_attach">40</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">0</property>
-            <property name="top_attach">40</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="ellipsize40">
             <property name="label" translatable="yes">end</property>
+            <layout>
+              <property name="left_attach">1</property>
+              <property name="top_attach">40</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">1</property>
-            <property name="top_attach">40</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="width_chars40">
             <property name="label" translatable="yes">4</property>
+            <layout>
+              <property name="left_attach">2</property>
+              <property name="top_attach">40</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">2</property>
-            <property name="top_attach">40</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="max_width_chars40">
             <property name="label" translatable="yes">8</property>
+            <layout>
+              <property name="left_attach">3</property>
+              <property name="top_attach">40</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">3</property>
-            <property name="top_attach">40</property>
-          </packing>
         </child>
         <child>
           <object class="GtkPaned" id="paned40">
-            <property name="shrink-child2">False</property>
-            <property name="resize-child2">True</property>
-            <property name="shrink-child1">False</property>
-            <property name="resize-child1">False</property>
+            <property name="shrink-child2">0</property>
+            <property name="shrink-child1">0</property>
+            <property name="resize-child1">0</property>
             <property name="can_focus">1</property>
             <child>
               <object class="GtkPaned" id="required40">
-                <property name="shrink-child2">False</property>
-                <property name="resize-child2">True</property>
-                <property name="shrink-child1">False</property>
-                <property name="resize-child1">False</property>
+                <property name="shrink-child2">0</property>
+                <property name="shrink-child1">0</property>
+                <property name="resize-child1">0</property>
                 <property name="can_focus">1</property>
                 <property name="orientation">vertical</property>
                 <child>
@@ -4896,10 +4778,9 @@
             </child>
             <child>
               <object class="GtkPaned" id="natural40">
-                <property name="shrink-child2">False</property>
-                <property name="resize-child2">True</property>
-                <property name="shrink-child1">False</property>
-                <property name="resize-child1">False</property>
+                <property name="shrink-child2">0</property>
+                <property name="shrink-child1">0</property>
+                <property name="resize-child1">0</property>
                 <property name="can_focus">1</property>
                 <property name="orientation">vertical</property>
                 <child>
@@ -4934,61 +4815,59 @@
                 </child>
               </object>
             </child>
+            <layout>
+              <property name="left_attach">4</property>
+              <property name="top_attach">40</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">4</property>
-            <property name="top_attach">40</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="wrap41">
             <property name="label" translatable="yes">False</property>
+            <layout>
+              <property name="left_attach">0</property>
+              <property name="top_attach">41</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">0</property>
-            <property name="top_attach">41</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="ellipsize41">
             <property name="label" translatable="yes">none</property>
+            <layout>
+              <property name="left_attach">1</property>
+              <property name="top_attach">41</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">1</property>
-            <property name="top_attach">41</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="width_chars41">
             <property name="label" translatable="yes">8</property>
+            <layout>
+              <property name="left_attach">2</property>
+              <property name="top_attach">41</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">2</property>
-            <property name="top_attach">41</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="max_width_chars41">
             <property name="label" translatable="yes">8</property>
+            <layout>
+              <property name="left_attach">3</property>
+              <property name="top_attach">41</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">3</property>
-            <property name="top_attach">41</property>
-          </packing>
         </child>
         <child>
           <object class="GtkPaned" id="paned41">
-            <property name="shrink-child2">False</property>
-            <property name="resize-child2">True</property>
-            <property name="shrink-child1">False</property>
-            <property name="resize-child1">False</property>
+            <property name="shrink-child2">0</property>
+            <property name="shrink-child1">0</property>
+            <property name="resize-child1">0</property>
             <property name="can_focus">1</property>
             <child>
               <object class="GtkPaned" id="required41">
-                <property name="shrink-child2">False</property>
-                <property name="resize-child2">True</property>
-                <property name="shrink-child1">False</property>
-                <property name="resize-child1">False</property>
+                <property name="shrink-child2">0</property>
+                <property name="shrink-child1">0</property>
+                <property name="resize-child1">0</property>
                 <property name="can_focus">1</property>
                 <property name="orientation">vertical</property>
                 <child>
@@ -5021,10 +4900,9 @@
             </child>
             <child>
               <object class="GtkPaned" id="natural41">
-                <property name="shrink-child2">False</property>
-                <property name="resize-child2">True</property>
-                <property name="shrink-child1">False</property>
-                <property name="resize-child1">False</property>
+                <property name="shrink-child2">0</property>
+                <property name="shrink-child1">0</property>
+                <property name="resize-child1">0</property>
                 <property name="can_focus">1</property>
                 <property name="orientation">vertical</property>
                 <child>
@@ -5055,61 +4933,59 @@
                 </child>
               </object>
             </child>
+            <layout>
+              <property name="left_attach">4</property>
+              <property name="top_attach">41</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">4</property>
-            <property name="top_attach">41</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="wrap42">
             <property name="label" translatable="yes">True</property>
+            <layout>
+              <property name="left_attach">0</property>
+              <property name="top_attach">42</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">0</property>
-            <property name="top_attach">42</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="ellipsize42">
             <property name="label" translatable="yes">none</property>
+            <layout>
+              <property name="left_attach">1</property>
+              <property name="top_attach">42</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">1</property>
-            <property name="top_attach">42</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="width_chars42">
             <property name="label" translatable="yes">8</property>
+            <layout>
+              <property name="left_attach">2</property>
+              <property name="top_attach">42</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">2</property>
-            <property name="top_attach">42</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="max_width_chars42">
             <property name="label" translatable="yes">8</property>
+            <layout>
+              <property name="left_attach">3</property>
+              <property name="top_attach">42</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">3</property>
-            <property name="top_attach">42</property>
-          </packing>
         </child>
         <child>
           <object class="GtkPaned" id="paned42">
-            <property name="shrink-child2">False</property>
-            <property name="resize-child2">True</property>
-            <property name="shrink-child1">False</property>
-            <property name="resize-child1">False</property>
+            <property name="shrink-child2">0</property>
+            <property name="shrink-child1">0</property>
+            <property name="resize-child1">0</property>
             <property name="can_focus">1</property>
             <child>
               <object class="GtkPaned" id="required42">
-                <property name="shrink-child2">False</property>
-                <property name="resize-child2">True</property>
-                <property name="shrink-child1">False</property>
-                <property name="resize-child1">False</property>
+                <property name="shrink-child2">0</property>
+                <property name="shrink-child1">0</property>
+                <property name="resize-child1">0</property>
                 <property name="can_focus">1</property>
                 <property name="orientation">vertical</property>
                 <child>
@@ -5144,10 +5020,9 @@
             </child>
             <child>
               <object class="GtkPaned" id="natural42">
-                <property name="shrink-child2">False</property>
-                <property name="resize-child2">True</property>
-                <property name="shrink-child1">False</property>
-                <property name="resize-child1">False</property>
+                <property name="shrink-child2">0</property>
+                <property name="shrink-child1">0</property>
+                <property name="resize-child1">0</property>
                 <property name="can_focus">1</property>
                 <property name="orientation">vertical</property>
                 <child>
@@ -5180,61 +5055,59 @@
                 </child>
               </object>
             </child>
+            <layout>
+              <property name="left_attach">4</property>
+              <property name="top_attach">42</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">4</property>
-            <property name="top_attach">42</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="wrap43">
             <property name="label" translatable="yes">False</property>
+            <layout>
+              <property name="left_attach">0</property>
+              <property name="top_attach">43</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">0</property>
-            <property name="top_attach">43</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="ellipsize43">
             <property name="label" translatable="yes">end</property>
+            <layout>
+              <property name="left_attach">1</property>
+              <property name="top_attach">43</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">1</property>
-            <property name="top_attach">43</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="width_chars43">
             <property name="label" translatable="yes">8</property>
+            <layout>
+              <property name="left_attach">2</property>
+              <property name="top_attach">43</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">2</property>
-            <property name="top_attach">43</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="max_width_chars43">
             <property name="label" translatable="yes">8</property>
+            <layout>
+              <property name="left_attach">3</property>
+              <property name="top_attach">43</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">3</property>
-            <property name="top_attach">43</property>
-          </packing>
         </child>
         <child>
           <object class="GtkPaned" id="paned43">
-            <property name="shrink-child2">False</property>
-            <property name="resize-child2">True</property>
-            <property name="shrink-child1">False</property>
-            <property name="resize-child1">False</property>
+            <property name="shrink-child2">0</property>
+            <property name="shrink-child1">0</property>
+            <property name="resize-child1">0</property>
             <property name="can_focus">1</property>
             <child>
               <object class="GtkPaned" id="required43">
-                <property name="shrink-child2">False</property>
-                <property name="resize-child2">True</property>
-                <property name="shrink-child1">False</property>
-                <property name="resize-child1">False</property>
+                <property name="shrink-child2">0</property>
+                <property name="shrink-child1">0</property>
+                <property name="resize-child1">0</property>
                 <property name="can_focus">1</property>
                 <property name="orientation">vertical</property>
                 <child>
@@ -5269,10 +5142,9 @@
             </child>
             <child>
               <object class="GtkPaned" id="natural43">
-                <property name="shrink-child2">False</property>
-                <property name="resize-child2">True</property>
-                <property name="shrink-child1">False</property>
-                <property name="resize-child1">False</property>
+                <property name="shrink-child2">0</property>
+                <property name="shrink-child1">0</property>
+                <property name="resize-child1">0</property>
                 <property name="can_focus">1</property>
                 <property name="orientation">vertical</property>
                 <child>
@@ -5305,61 +5177,59 @@
                 </child>
               </object>
             </child>
+            <layout>
+              <property name="left_attach">4</property>
+              <property name="top_attach">43</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">4</property>
-            <property name="top_attach">43</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="wrap44">
             <property name="label" translatable="yes">True</property>
+            <layout>
+              <property name="left_attach">0</property>
+              <property name="top_attach">44</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">0</property>
-            <property name="top_attach">44</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="ellipsize44">
             <property name="label" translatable="yes">end</property>
+            <layout>
+              <property name="left_attach">1</property>
+              <property name="top_attach">44</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">1</property>
-            <property name="top_attach">44</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="width_chars44">
             <property name="label" translatable="yes">8</property>
+            <layout>
+              <property name="left_attach">2</property>
+              <property name="top_attach">44</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">2</property>
-            <property name="top_attach">44</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="max_width_chars44">
             <property name="label" translatable="yes">8</property>
+            <layout>
+              <property name="left_attach">3</property>
+              <property name="top_attach">44</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">3</property>
-            <property name="top_attach">44</property>
-          </packing>
         </child>
         <child>
           <object class="GtkPaned" id="paned44">
-            <property name="shrink-child2">False</property>
-            <property name="resize-child2">True</property>
-            <property name="shrink-child1">False</property>
-            <property name="resize-child1">False</property>
+            <property name="shrink-child2">0</property>
+            <property name="shrink-child1">0</property>
+            <property name="resize-child1">0</property>
             <property name="can_focus">1</property>
             <child>
               <object class="GtkPaned" id="required44">
-                <property name="shrink-child2">False</property>
-                <property name="resize-child2">True</property>
-                <property name="shrink-child1">False</property>
-                <property name="resize-child1">False</property>
+                <property name="shrink-child2">0</property>
+                <property name="shrink-child1">0</property>
+                <property name="resize-child1">0</property>
                 <property name="can_focus">1</property>
                 <property name="orientation">vertical</property>
                 <child>
@@ -5396,10 +5266,9 @@
             </child>
             <child>
               <object class="GtkPaned" id="natural44">
-                <property name="shrink-child2">False</property>
-                <property name="resize-child2">True</property>
-                <property name="shrink-child1">False</property>
-                <property name="resize-child1">False</property>
+                <property name="shrink-child2">0</property>
+                <property name="shrink-child1">0</property>
+                <property name="resize-child1">0</property>
                 <property name="can_focus">1</property>
                 <property name="orientation">vertical</property>
                 <child>
@@ -5434,61 +5303,59 @@
                 </child>
               </object>
             </child>
+            <layout>
+              <property name="left_attach">4</property>
+              <property name="top_attach">44</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">4</property>
-            <property name="top_attach">44</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="wrap45">
             <property name="label" translatable="yes">False</property>
+            <layout>
+              <property name="left_attach">0</property>
+              <property name="top_attach">45</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">0</property>
-            <property name="top_attach">45</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="ellipsize45">
             <property name="label" translatable="yes">none</property>
+            <layout>
+              <property name="left_attach">1</property>
+              <property name="top_attach">45</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">1</property>
-            <property name="top_attach">45</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="width_chars45">
             <property name="label" translatable="yes">12</property>
+            <layout>
+              <property name="left_attach">2</property>
+              <property name="top_attach">45</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">2</property>
-            <property name="top_attach">45</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="max_width_chars45">
             <property name="label" translatable="yes">8</property>
+            <layout>
+              <property name="left_attach">3</property>
+              <property name="top_attach">45</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">3</property>
-            <property name="top_attach">45</property>
-          </packing>
         </child>
         <child>
           <object class="GtkPaned" id="paned45">
-            <property name="shrink-child2">False</property>
-            <property name="resize-child2">True</property>
-            <property name="shrink-child1">False</property>
-            <property name="resize-child1">False</property>
+            <property name="shrink-child2">0</property>
+            <property name="shrink-child1">0</property>
+            <property name="resize-child1">0</property>
             <property name="can_focus">1</property>
             <child>
               <object class="GtkPaned" id="required45">
-                <property name="shrink-child2">False</property>
-                <property name="resize-child2">True</property>
-                <property name="shrink-child1">False</property>
-                <property name="resize-child1">False</property>
+                <property name="shrink-child2">0</property>
+                <property name="shrink-child1">0</property>
+                <property name="resize-child1">0</property>
                 <property name="can_focus">1</property>
                 <property name="orientation">vertical</property>
                 <child>
@@ -5521,10 +5388,9 @@
             </child>
             <child>
               <object class="GtkPaned" id="natural45">
-                <property name="shrink-child2">False</property>
-                <property name="resize-child2">True</property>
-                <property name="shrink-child1">False</property>
-                <property name="resize-child1">False</property>
+                <property name="shrink-child2">0</property>
+                <property name="shrink-child1">0</property>
+                <property name="resize-child1">0</property>
                 <property name="can_focus">1</property>
                 <property name="orientation">vertical</property>
                 <child>
@@ -5555,61 +5421,59 @@
                 </child>
               </object>
             </child>
+            <layout>
+              <property name="left_attach">4</property>
+              <property name="top_attach">45</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">4</property>
-            <property name="top_attach">45</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="wrap46">
             <property name="label" translatable="yes">True</property>
+            <layout>
+              <property name="left_attach">0</property>
+              <property name="top_attach">46</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">0</property>
-            <property name="top_attach">46</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="ellipsize46">
             <property name="label" translatable="yes">none</property>
+            <layout>
+              <property name="left_attach">1</property>
+              <property name="top_attach">46</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">1</property>
-            <property name="top_attach">46</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="width_chars46">
             <property name="label" translatable="yes">12</property>
+            <layout>
+              <property name="left_attach">2</property>
+              <property name="top_attach">46</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">2</property>
-            <property name="top_attach">46</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="max_width_chars46">
             <property name="label" translatable="yes">8</property>
+            <layout>
+              <property name="left_attach">3</property>
+              <property name="top_attach">46</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">3</property>
-            <property name="top_attach">46</property>
-          </packing>
         </child>
         <child>
           <object class="GtkPaned" id="paned46">
-            <property name="shrink-child2">False</property>
-            <property name="resize-child2">True</property>
-            <property name="shrink-child1">False</property>
-            <property name="resize-child1">False</property>
+            <property name="shrink-child2">0</property>
+            <property name="shrink-child1">0</property>
+            <property name="resize-child1">0</property>
             <property name="can_focus">1</property>
             <child>
               <object class="GtkPaned" id="required46">
-                <property name="shrink-child2">False</property>
-                <property name="resize-child2">True</property>
-                <property name="shrink-child1">False</property>
-                <property name="resize-child1">False</property>
+                <property name="shrink-child2">0</property>
+                <property name="shrink-child1">0</property>
+                <property name="resize-child1">0</property>
                 <property name="can_focus">1</property>
                 <property name="orientation">vertical</property>
                 <child>
@@ -5644,10 +5508,9 @@
             </child>
             <child>
               <object class="GtkPaned" id="natural46">
-                <property name="shrink-child2">False</property>
-                <property name="resize-child2">True</property>
-                <property name="shrink-child1">False</property>
-                <property name="resize-child1">False</property>
+                <property name="shrink-child2">0</property>
+                <property name="shrink-child1">0</property>
+                <property name="resize-child1">0</property>
                 <property name="can_focus">1</property>
                 <property name="orientation">vertical</property>
                 <child>
@@ -5680,61 +5543,59 @@
                 </child>
               </object>
             </child>
+            <layout>
+              <property name="left_attach">4</property>
+              <property name="top_attach">46</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">4</property>
-            <property name="top_attach">46</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="wrap47">
             <property name="label" translatable="yes">False</property>
+            <layout>
+              <property name="left_attach">0</property>
+              <property name="top_attach">47</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">0</property>
-            <property name="top_attach">47</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="ellipsize47">
             <property name="label" translatable="yes">end</property>
+            <layout>
+              <property name="left_attach">1</property>
+              <property name="top_attach">47</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">1</property>
-            <property name="top_attach">47</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="width_chars47">
             <property name="label" translatable="yes">12</property>
+            <layout>
+              <property name="left_attach">2</property>
+              <property name="top_attach">47</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">2</property>
-            <property name="top_attach">47</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="max_width_chars47">
             <property name="label" translatable="yes">8</property>
+            <layout>
+              <property name="left_attach">3</property>
+              <property name="top_attach">47</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">3</property>
-            <property name="top_attach">47</property>
-          </packing>
         </child>
         <child>
           <object class="GtkPaned" id="paned47">
-            <property name="shrink-child2">False</property>
-            <property name="resize-child2">True</property>
-            <property name="shrink-child1">False</property>
-            <property name="resize-child1">False</property>
+            <property name="shrink-child2">0</property>
+            <property name="shrink-child1">0</property>
+            <property name="resize-child1">0</property>
             <property name="can_focus">1</property>
             <child>
               <object class="GtkPaned" id="required47">
-                <property name="shrink-child2">False</property>
-                <property name="resize-child2">True</property>
-                <property name="shrink-child1">False</property>
-                <property name="resize-child1">False</property>
+                <property name="shrink-child2">0</property>
+                <property name="shrink-child1">0</property>
+                <property name="resize-child1">0</property>
                 <property name="can_focus">1</property>
                 <property name="orientation">vertical</property>
                 <child>
@@ -5769,10 +5630,9 @@
             </child>
             <child>
               <object class="GtkPaned" id="natural47">
-                <property name="shrink-child2">False</property>
-                <property name="resize-child2">True</property>
-                <property name="shrink-child1">False</property>
-                <property name="resize-child1">False</property>
+                <property name="shrink-child2">0</property>
+                <property name="shrink-child1">0</property>
+                <property name="resize-child1">0</property>
                 <property name="can_focus">1</property>
                 <property name="orientation">vertical</property>
                 <child>
@@ -5805,61 +5665,59 @@
                 </child>
               </object>
             </child>
+            <layout>
+              <property name="left_attach">4</property>
+              <property name="top_attach">47</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">4</property>
-            <property name="top_attach">47</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="wrap48">
             <property name="label" translatable="yes">True</property>
+            <layout>
+              <property name="left_attach">0</property>
+              <property name="top_attach">48</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">0</property>
-            <property name="top_attach">48</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="ellipsize48">
             <property name="label" translatable="yes">end</property>
+            <layout>
+              <property name="left_attach">1</property>
+              <property name="top_attach">48</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">1</property>
-            <property name="top_attach">48</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="width_chars48">
             <property name="label" translatable="yes">12</property>
+            <layout>
+              <property name="left_attach">2</property>
+              <property name="top_attach">48</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">2</property>
-            <property name="top_attach">48</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="max_width_chars48">
             <property name="label" translatable="yes">8</property>
+            <layout>
+              <property name="left_attach">3</property>
+              <property name="top_attach">48</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">3</property>
-            <property name="top_attach">48</property>
-          </packing>
         </child>
         <child>
           <object class="GtkPaned" id="paned48">
-            <property name="shrink-child2">False</property>
-            <property name="resize-child2">True</property>
-            <property name="shrink-child1">False</property>
-            <property name="resize-child1">False</property>
+            <property name="shrink-child2">0</property>
+            <property name="shrink-child1">0</property>
+            <property name="resize-child1">0</property>
             <property name="can_focus">1</property>
             <child>
               <object class="GtkPaned" id="required48">
-                <property name="shrink-child2">False</property>
-                <property name="resize-child2">True</property>
-                <property name="shrink-child1">False</property>
-                <property name="resize-child1">False</property>
+                <property name="shrink-child2">0</property>
+                <property name="shrink-child1">0</property>
+                <property name="resize-child1">0</property>
                 <property name="can_focus">1</property>
                 <property name="orientation">vertical</property>
                 <child>
@@ -5896,10 +5754,9 @@
             </child>
             <child>
               <object class="GtkPaned" id="natural48">
-                <property name="shrink-child2">False</property>
-                <property name="resize-child2">True</property>
-                <property name="shrink-child1">False</property>
-                <property name="resize-child1">False</property>
+                <property name="shrink-child2">0</property>
+                <property name="shrink-child1">0</property>
+                <property name="resize-child1">0</property>
                 <property name="can_focus">1</property>
                 <property name="orientation">vertical</property>
                 <child>
@@ -5934,61 +5791,59 @@
                 </child>
               </object>
             </child>
+            <layout>
+              <property name="left_attach">4</property>
+              <property name="top_attach">48</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">4</property>
-            <property name="top_attach">48</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="wrap49">
             <property name="label" translatable="yes">False</property>
+            <layout>
+              <property name="left_attach">0</property>
+              <property name="top_attach">49</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">0</property>
-            <property name="top_attach">49</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="ellipsize49">
             <property name="label" translatable="yes">none</property>
+            <layout>
+              <property name="left_attach">1</property>
+              <property name="top_attach">49</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">1</property>
-            <property name="top_attach">49</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="width_chars49">
             <property name="label" translatable="yes">-1</property>
+            <layout>
+              <property name="left_attach">2</property>
+              <property name="top_attach">49</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">2</property>
-            <property name="top_attach">49</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="max_width_chars49">
             <property name="label" translatable="yes">12</property>
+            <layout>
+              <property name="left_attach">3</property>
+              <property name="top_attach">49</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">3</property>
-            <property name="top_attach">49</property>
-          </packing>
         </child>
         <child>
           <object class="GtkPaned" id="paned49">
-            <property name="shrink-child2">False</property>
-            <property name="resize-child2">True</property>
-            <property name="shrink-child1">False</property>
-            <property name="resize-child1">False</property>
+            <property name="shrink-child2">0</property>
+            <property name="shrink-child1">0</property>
+            <property name="resize-child1">0</property>
             <property name="can_focus">1</property>
             <child>
               <object class="GtkPaned" id="required49">
-                <property name="shrink-child2">False</property>
-                <property name="resize-child2">True</property>
-                <property name="shrink-child1">False</property>
-                <property name="resize-child1">False</property>
+                <property name="shrink-child2">0</property>
+                <property name="shrink-child1">0</property>
+                <property name="resize-child1">0</property>
                 <property name="can_focus">1</property>
                 <property name="orientation">vertical</property>
                 <child>
@@ -6019,10 +5874,9 @@
             </child>
             <child>
               <object class="GtkPaned" id="natural49">
-                <property name="shrink-child2">False</property>
-                <property name="resize-child2">True</property>
-                <property name="shrink-child1">False</property>
-                <property name="resize-child1">False</property>
+                <property name="shrink-child2">0</property>
+                <property name="shrink-child1">0</property>
+                <property name="resize-child1">0</property>
                 <property name="can_focus">1</property>
                 <property name="orientation">vertical</property>
                 <child>
@@ -6051,61 +5905,59 @@
                 </child>
               </object>
             </child>
+            <layout>
+              <property name="left_attach">4</property>
+              <property name="top_attach">49</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">4</property>
-            <property name="top_attach">49</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="wrap50">
             <property name="label" translatable="yes">True</property>
+            <layout>
+              <property name="left_attach">0</property>
+              <property name="top_attach">50</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">0</property>
-            <property name="top_attach">50</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="ellipsize50">
             <property name="label" translatable="yes">none</property>
+            <layout>
+              <property name="left_attach">1</property>
+              <property name="top_attach">50</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">1</property>
-            <property name="top_attach">50</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="width_chars50">
             <property name="label" translatable="yes">-1</property>
+            <layout>
+              <property name="left_attach">2</property>
+              <property name="top_attach">50</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">2</property>
-            <property name="top_attach">50</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="max_width_chars50">
             <property name="label" translatable="yes">12</property>
+            <layout>
+              <property name="left_attach">3</property>
+              <property name="top_attach">50</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">3</property>
-            <property name="top_attach">50</property>
-          </packing>
         </child>
         <child>
           <object class="GtkPaned" id="paned50">
-            <property name="shrink-child2">False</property>
-            <property name="resize-child2">True</property>
-            <property name="shrink-child1">False</property>
-            <property name="resize-child1">False</property>
+            <property name="shrink-child2">0</property>
+            <property name="shrink-child1">0</property>
+            <property name="resize-child1">0</property>
             <property name="can_focus">1</property>
             <child>
               <object class="GtkPaned" id="required50">
-                <property name="shrink-child2">False</property>
-                <property name="resize-child2">True</property>
-                <property name="shrink-child1">False</property>
-                <property name="resize-child1">False</property>
+                <property name="shrink-child2">0</property>
+                <property name="shrink-child1">0</property>
+                <property name="resize-child1">0</property>
                 <property name="can_focus">1</property>
                 <property name="orientation">vertical</property>
                 <child>
@@ -6138,10 +5990,9 @@
             </child>
             <child>
               <object class="GtkPaned" id="natural50">
-                <property name="shrink-child2">False</property>
-                <property name="resize-child2">True</property>
-                <property name="shrink-child1">False</property>
-                <property name="resize-child1">False</property>
+                <property name="shrink-child2">0</property>
+                <property name="shrink-child1">0</property>
+                <property name="resize-child1">0</property>
                 <property name="can_focus">1</property>
                 <property name="orientation">vertical</property>
                 <child>
@@ -6172,61 +6023,59 @@
                 </child>
               </object>
             </child>
+            <layout>
+              <property name="left_attach">4</property>
+              <property name="top_attach">50</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">4</property>
-            <property name="top_attach">50</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="wrap51">
             <property name="label" translatable="yes">False</property>
+            <layout>
+              <property name="left_attach">0</property>
+              <property name="top_attach">51</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">0</property>
-            <property name="top_attach">51</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="ellipsize51">
             <property name="label" translatable="yes">end</property>
+            <layout>
+              <property name="left_attach">1</property>
+              <property name="top_attach">51</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">1</property>
-            <property name="top_attach">51</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="width_chars51">
             <property name="label" translatable="yes">-1</property>
+            <layout>
+              <property name="left_attach">2</property>
+              <property name="top_attach">51</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">2</property>
-            <property name="top_attach">51</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="max_width_chars51">
             <property name="label" translatable="yes">12</property>
+            <layout>
+              <property name="left_attach">3</property>
+              <property name="top_attach">51</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">3</property>
-            <property name="top_attach">51</property>
-          </packing>
         </child>
         <child>
           <object class="GtkPaned" id="paned51">
-            <property name="shrink-child2">False</property>
-            <property name="resize-child2">True</property>
-            <property name="shrink-child1">False</property>
-            <property name="resize-child1">False</property>
+            <property name="shrink-child2">0</property>
+            <property name="shrink-child1">0</property>
+            <property name="resize-child1">0</property>
             <property name="can_focus">1</property>
             <child>
               <object class="GtkPaned" id="required51">
-                <property name="shrink-child2">False</property>
-                <property name="resize-child2">True</property>
-                <property name="shrink-child1">False</property>
-                <property name="resize-child1">False</property>
+                <property name="shrink-child2">0</property>
+                <property name="shrink-child1">0</property>
+                <property name="resize-child1">0</property>
                 <property name="can_focus">1</property>
                 <property name="orientation">vertical</property>
                 <child>
@@ -6259,10 +6108,9 @@
             </child>
             <child>
               <object class="GtkPaned" id="natural51">
-                <property name="shrink-child2">False</property>
-                <property name="resize-child2">True</property>
-                <property name="shrink-child1">False</property>
-                <property name="resize-child1">False</property>
+                <property name="shrink-child2">0</property>
+                <property name="shrink-child1">0</property>
+                <property name="resize-child1">0</property>
                 <property name="can_focus">1</property>
                 <property name="orientation">vertical</property>
                 <child>
@@ -6293,61 +6141,59 @@
                 </child>
               </object>
             </child>
+            <layout>
+              <property name="left_attach">4</property>
+              <property name="top_attach">51</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">4</property>
-            <property name="top_attach">51</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="wrap52">
             <property name="label" translatable="yes">True</property>
+            <layout>
+              <property name="left_attach">0</property>
+              <property name="top_attach">52</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">0</property>
-            <property name="top_attach">52</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="ellipsize52">
             <property name="label" translatable="yes">end</property>
+            <layout>
+              <property name="left_attach">1</property>
+              <property name="top_attach">52</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">1</property>
-            <property name="top_attach">52</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="width_chars52">
             <property name="label" translatable="yes">-1</property>
+            <layout>
+              <property name="left_attach">2</property>
+              <property name="top_attach">52</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">2</property>
-            <property name="top_attach">52</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="max_width_chars52">
             <property name="label" translatable="yes">12</property>
+            <layout>
+              <property name="left_attach">3</property>
+              <property name="top_attach">52</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">3</property>
-            <property name="top_attach">52</property>
-          </packing>
         </child>
         <child>
           <object class="GtkPaned" id="paned52">
-            <property name="shrink-child2">False</property>
-            <property name="resize-child2">True</property>
-            <property name="shrink-child1">False</property>
-            <property name="resize-child1">False</property>
+            <property name="shrink-child2">0</property>
+            <property name="shrink-child1">0</property>
+            <property name="resize-child1">0</property>
             <property name="can_focus">1</property>
             <child>
               <object class="GtkPaned" id="required52">
-                <property name="shrink-child2">False</property>
-                <property name="resize-child2">True</property>
-                <property name="shrink-child1">False</property>
-                <property name="resize-child1">False</property>
+                <property name="shrink-child2">0</property>
+                <property name="shrink-child1">0</property>
+                <property name="resize-child1">0</property>
                 <property name="can_focus">1</property>
                 <property name="orientation">vertical</property>
                 <child>
@@ -6382,10 +6228,9 @@
             </child>
             <child>
               <object class="GtkPaned" id="natural52">
-                <property name="shrink-child2">False</property>
-                <property name="resize-child2">True</property>
-                <property name="shrink-child1">False</property>
-                <property name="resize-child1">False</property>
+                <property name="shrink-child2">0</property>
+                <property name="shrink-child1">0</property>
+                <property name="resize-child1">0</property>
                 <property name="can_focus">1</property>
                 <property name="orientation">vertical</property>
                 <child>
@@ -6418,61 +6263,59 @@
                 </child>
               </object>
             </child>
+            <layout>
+              <property name="left_attach">4</property>
+              <property name="top_attach">52</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">4</property>
-            <property name="top_attach">52</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="wrap53">
             <property name="label" translatable="yes">False</property>
+            <layout>
+              <property name="left_attach">0</property>
+              <property name="top_attach">53</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">0</property>
-            <property name="top_attach">53</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="ellipsize53">
             <property name="label" translatable="yes">none</property>
+            <layout>
+              <property name="left_attach">1</property>
+              <property name="top_attach">53</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">1</property>
-            <property name="top_attach">53</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="width_chars53">
             <property name="label" translatable="yes">4</property>
+            <layout>
+              <property name="left_attach">2</property>
+              <property name="top_attach">53</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">2</property>
-            <property name="top_attach">53</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="max_width_chars53">
             <property name="label" translatable="yes">12</property>
+            <layout>
+              <property name="left_attach">3</property>
+              <property name="top_attach">53</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">3</property>
-            <property name="top_attach">53</property>
-          </packing>
         </child>
         <child>
           <object class="GtkPaned" id="paned53">
-            <property name="shrink-child2">False</property>
-            <property name="resize-child2">True</property>
-            <property name="shrink-child1">False</property>
-            <property name="resize-child1">False</property>
+            <property name="shrink-child2">0</property>
+            <property name="shrink-child1">0</property>
+            <property name="resize-child1">0</property>
             <property name="can_focus">1</property>
             <child>
               <object class="GtkPaned" id="required53">
-                <property name="shrink-child2">False</property>
-                <property name="resize-child2">True</property>
-                <property name="shrink-child1">False</property>
-                <property name="resize-child1">False</property>
+                <property name="shrink-child2">0</property>
+                <property name="shrink-child1">0</property>
+                <property name="resize-child1">0</property>
                 <property name="can_focus">1</property>
                 <property name="orientation">vertical</property>
                 <child>
@@ -6505,10 +6348,9 @@
             </child>
             <child>
               <object class="GtkPaned" id="natural53">
-                <property name="shrink-child2">False</property>
-                <property name="resize-child2">True</property>
-                <property name="shrink-child1">False</property>
-                <property name="resize-child1">False</property>
+                <property name="shrink-child2">0</property>
+                <property name="shrink-child1">0</property>
+                <property name="resize-child1">0</property>
                 <property name="can_focus">1</property>
                 <property name="orientation">vertical</property>
                 <child>
@@ -6539,61 +6381,59 @@
                 </child>
               </object>
             </child>
+            <layout>
+              <property name="left_attach">4</property>
+              <property name="top_attach">53</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">4</property>
-            <property name="top_attach">53</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="wrap54">
             <property name="label" translatable="yes">True</property>
+            <layout>
+              <property name="left_attach">0</property>
+              <property name="top_attach">54</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">0</property>
-            <property name="top_attach">54</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="ellipsize54">
             <property name="label" translatable="yes">none</property>
+            <layout>
+              <property name="left_attach">1</property>
+              <property name="top_attach">54</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">1</property>
-            <property name="top_attach">54</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="width_chars54">
             <property name="label" translatable="yes">4</property>
+            <layout>
+              <property name="left_attach">2</property>
+              <property name="top_attach">54</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">2</property>
-            <property name="top_attach">54</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="max_width_chars54">
             <property name="label" translatable="yes">12</property>
+            <layout>
+              <property name="left_attach">3</property>
+              <property name="top_attach">54</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">3</property>
-            <property name="top_attach">54</property>
-          </packing>
         </child>
         <child>
           <object class="GtkPaned" id="paned54">
-            <property name="shrink-child2">False</property>
-            <property name="resize-child2">True</property>
-            <property name="shrink-child1">False</property>
-            <property name="resize-child1">False</property>
+            <property name="shrink-child2">0</property>
+            <property name="shrink-child1">0</property>
+            <property name="resize-child1">0</property>
             <property name="can_focus">1</property>
             <child>
               <object class="GtkPaned" id="required54">
-                <property name="shrink-child2">False</property>
-                <property name="resize-child2">True</property>
-                <property name="shrink-child1">False</property>
-                <property name="resize-child1">False</property>
+                <property name="shrink-child2">0</property>
+                <property name="shrink-child1">0</property>
+                <property name="resize-child1">0</property>
                 <property name="can_focus">1</property>
                 <property name="orientation">vertical</property>
                 <child>
@@ -6628,10 +6468,9 @@
             </child>
             <child>
               <object class="GtkPaned" id="natural54">
-                <property name="shrink-child2">False</property>
-                <property name="resize-child2">True</property>
-                <property name="shrink-child1">False</property>
-                <property name="resize-child1">False</property>
+                <property name="shrink-child2">0</property>
+                <property name="shrink-child1">0</property>
+                <property name="resize-child1">0</property>
                 <property name="can_focus">1</property>
                 <property name="orientation">vertical</property>
                 <child>
@@ -6664,61 +6503,59 @@
                 </child>
               </object>
             </child>
+            <layout>
+              <property name="left_attach">4</property>
+              <property name="top_attach">54</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">4</property>
-            <property name="top_attach">54</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="wrap55">
             <property name="label" translatable="yes">False</property>
+            <layout>
+              <property name="left_attach">0</property>
+              <property name="top_attach">55</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">0</property>
-            <property name="top_attach">55</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="ellipsize55">
             <property name="label" translatable="yes">end</property>
+            <layout>
+              <property name="left_attach">1</property>
+              <property name="top_attach">55</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">1</property>
-            <property name="top_attach">55</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="width_chars55">
             <property name="label" translatable="yes">4</property>
+            <layout>
+              <property name="left_attach">2</property>
+              <property name="top_attach">55</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">2</property>
-            <property name="top_attach">55</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="max_width_chars55">
             <property name="label" translatable="yes">12</property>
+            <layout>
+              <property name="left_attach">3</property>
+              <property name="top_attach">55</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">3</property>
-            <property name="top_attach">55</property>
-          </packing>
         </child>
         <child>
           <object class="GtkPaned" id="paned55">
-            <property name="shrink-child2">False</property>
-            <property name="resize-child2">True</property>
-            <property name="shrink-child1">False</property>
-            <property name="resize-child1">False</property>
+            <property name="shrink-child2">0</property>
+            <property name="shrink-child1">0</property>
+            <property name="resize-child1">0</property>
             <property name="can_focus">1</property>
             <child>
               <object class="GtkPaned" id="required55">
-                <property name="shrink-child2">False</property>
-                <property name="resize-child2">True</property>
-                <property name="shrink-child1">False</property>
-                <property name="resize-child1">False</property>
+                <property name="shrink-child2">0</property>
+                <property name="shrink-child1">0</property>
+                <property name="resize-child1">0</property>
                 <property name="can_focus">1</property>
                 <property name="orientation">vertical</property>
                 <child>
@@ -6753,10 +6590,9 @@
             </child>
             <child>
               <object class="GtkPaned" id="natural55">
-                <property name="shrink-child2">False</property>
-                <property name="resize-child2">True</property>
-                <property name="shrink-child1">False</property>
-                <property name="resize-child1">False</property>
+                <property name="shrink-child2">0</property>
+                <property name="shrink-child1">0</property>
+                <property name="resize-child1">0</property>
                 <property name="can_focus">1</property>
                 <property name="orientation">vertical</property>
                 <child>
@@ -6789,61 +6625,59 @@
                 </child>
               </object>
             </child>
+            <layout>
+              <property name="left_attach">4</property>
+              <property name="top_attach">55</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">4</property>
-            <property name="top_attach">55</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="wrap56">
             <property name="label" translatable="yes">True</property>
+            <layout>
+              <property name="left_attach">0</property>
+              <property name="top_attach">56</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">0</property>
-            <property name="top_attach">56</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="ellipsize56">
             <property name="label" translatable="yes">end</property>
+            <layout>
+              <property name="left_attach">1</property>
+              <property name="top_attach">56</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">1</property>
-            <property name="top_attach">56</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="width_chars56">
             <property name="label" translatable="yes">4</property>
+            <layout>
+              <property name="left_attach">2</property>
+              <property name="top_attach">56</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">2</property>
-            <property name="top_attach">56</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="max_width_chars56">
             <property name="label" translatable="yes">12</property>
+            <layout>
+              <property name="left_attach">3</property>
+              <property name="top_attach">56</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">3</property>
-            <property name="top_attach">56</property>
-          </packing>
         </child>
         <child>
           <object class="GtkPaned" id="paned56">
-            <property name="shrink-child2">False</property>
-            <property name="resize-child2">True</property>
-            <property name="shrink-child1">False</property>
-            <property name="resize-child1">False</property>
+            <property name="shrink-child2">0</property>
+            <property name="shrink-child1">0</property>
+            <property name="resize-child1">0</property>
             <property name="can_focus">1</property>
             <child>
               <object class="GtkPaned" id="required56">
-                <property name="shrink-child2">False</property>
-                <property name="resize-child2">True</property>
-                <property name="shrink-child1">False</property>
-                <property name="resize-child1">False</property>
+                <property name="shrink-child2">0</property>
+                <property name="shrink-child1">0</property>
+                <property name="resize-child1">0</property>
                 <property name="can_focus">1</property>
                 <property name="orientation">vertical</property>
                 <child>
@@ -6880,10 +6714,9 @@
             </child>
             <child>
               <object class="GtkPaned" id="natural56">
-                <property name="shrink-child2">False</property>
-                <property name="resize-child2">True</property>
-                <property name="shrink-child1">False</property>
-                <property name="resize-child1">False</property>
+                <property name="shrink-child2">0</property>
+                <property name="shrink-child1">0</property>
+                <property name="resize-child1">0</property>
                 <property name="can_focus">1</property>
                 <property name="orientation">vertical</property>
                 <child>
@@ -6918,61 +6751,59 @@
                 </child>
               </object>
             </child>
+            <layout>
+              <property name="left_attach">4</property>
+              <property name="top_attach">56</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">4</property>
-            <property name="top_attach">56</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="wrap57">
             <property name="label" translatable="yes">False</property>
+            <layout>
+              <property name="left_attach">0</property>
+              <property name="top_attach">57</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">0</property>
-            <property name="top_attach">57</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="ellipsize57">
             <property name="label" translatable="yes">none</property>
+            <layout>
+              <property name="left_attach">1</property>
+              <property name="top_attach">57</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">1</property>
-            <property name="top_attach">57</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="width_chars57">
             <property name="label" translatable="yes">8</property>
+            <layout>
+              <property name="left_attach">2</property>
+              <property name="top_attach">57</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">2</property>
-            <property name="top_attach">57</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="max_width_chars57">
             <property name="label" translatable="yes">12</property>
+            <layout>
+              <property name="left_attach">3</property>
+              <property name="top_attach">57</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">3</property>
-            <property name="top_attach">57</property>
-          </packing>
         </child>
         <child>
           <object class="GtkPaned" id="paned57">
-            <property name="shrink-child2">False</property>
-            <property name="resize-child2">True</property>
-            <property name="shrink-child1">False</property>
-            <property name="resize-child1">False</property>
+            <property name="shrink-child2">0</property>
+            <property name="shrink-child1">0</property>
+            <property name="resize-child1">0</property>
             <property name="can_focus">1</property>
             <child>
               <object class="GtkPaned" id="required57">
-                <property name="shrink-child2">False</property>
-                <property name="resize-child2">True</property>
-                <property name="shrink-child1">False</property>
-                <property name="resize-child1">False</property>
+                <property name="shrink-child2">0</property>
+                <property name="shrink-child1">0</property>
+                <property name="resize-child1">0</property>
                 <property name="can_focus">1</property>
                 <property name="orientation">vertical</property>
                 <child>
@@ -7005,10 +6836,9 @@
             </child>
             <child>
               <object class="GtkPaned" id="natural57">
-                <property name="shrink-child2">False</property>
-                <property name="resize-child2">True</property>
-                <property name="shrink-child1">False</property>
-                <property name="resize-child1">False</property>
+                <property name="shrink-child2">0</property>
+                <property name="shrink-child1">0</property>
+                <property name="resize-child1">0</property>
                 <property name="can_focus">1</property>
                 <property name="orientation">vertical</property>
                 <child>
@@ -7039,61 +6869,59 @@
                 </child>
               </object>
             </child>
+            <layout>
+              <property name="left_attach">4</property>
+              <property name="top_attach">57</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">4</property>
-            <property name="top_attach">57</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="wrap58">
             <property name="label" translatable="yes">True</property>
+            <layout>
+              <property name="left_attach">0</property>
+              <property name="top_attach">58</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">0</property>
-            <property name="top_attach">58</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="ellipsize58">
             <property name="label" translatable="yes">none</property>
+            <layout>
+              <property name="left_attach">1</property>
+              <property name="top_attach">58</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">1</property>
-            <property name="top_attach">58</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="width_chars58">
             <property name="label" translatable="yes">8</property>
+            <layout>
+              <property name="left_attach">2</property>
+              <property name="top_attach">58</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">2</property>
-            <property name="top_attach">58</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="max_width_chars58">
             <property name="label" translatable="yes">12</property>
+            <layout>
+              <property name="left_attach">3</property>
+              <property name="top_attach">58</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">3</property>
-            <property name="top_attach">58</property>
-          </packing>
         </child>
         <child>
           <object class="GtkPaned" id="paned58">
-            <property name="shrink-child2">False</property>
-            <property name="resize-child2">True</property>
-            <property name="shrink-child1">False</property>
-            <property name="resize-child1">False</property>
+            <property name="shrink-child2">0</property>
+            <property name="shrink-child1">0</property>
+            <property name="resize-child1">0</property>
             <property name="can_focus">1</property>
             <child>
               <object class="GtkPaned" id="required58">
-                <property name="shrink-child2">False</property>
-                <property name="resize-child2">True</property>
-                <property name="shrink-child1">False</property>
-                <property name="resize-child1">False</property>
+                <property name="shrink-child2">0</property>
+                <property name="shrink-child1">0</property>
+                <property name="resize-child1">0</property>
                 <property name="can_focus">1</property>
                 <property name="orientation">vertical</property>
                 <child>
@@ -7128,10 +6956,9 @@
             </child>
             <child>
               <object class="GtkPaned" id="natural58">
-                <property name="shrink-child2">False</property>
-                <property name="resize-child2">True</property>
-                <property name="shrink-child1">False</property>
-                <property name="resize-child1">False</property>
+                <property name="shrink-child2">0</property>
+                <property name="shrink-child1">0</property>
+                <property name="resize-child1">0</property>
                 <property name="can_focus">1</property>
                 <property name="orientation">vertical</property>
                 <child>
@@ -7164,61 +6991,59 @@
                 </child>
               </object>
             </child>
+            <layout>
+              <property name="left_attach">4</property>
+              <property name="top_attach">58</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">4</property>
-            <property name="top_attach">58</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="wrap59">
             <property name="label" translatable="yes">False</property>
+            <layout>
+              <property name="left_attach">0</property>
+              <property name="top_attach">59</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">0</property>
-            <property name="top_attach">59</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="ellipsize59">
             <property name="label" translatable="yes">end</property>
+            <layout>
+              <property name="left_attach">1</property>
+              <property name="top_attach">59</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">1</property>
-            <property name="top_attach">59</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="width_chars59">
             <property name="label" translatable="yes">8</property>
+            <layout>
+              <property name="left_attach">2</property>
+              <property name="top_attach">59</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">2</property>
-            <property name="top_attach">59</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="max_width_chars59">
             <property name="label" translatable="yes">12</property>
+            <layout>
+              <property name="left_attach">3</property>
+              <property name="top_attach">59</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">3</property>
-            <property name="top_attach">59</property>
-          </packing>
         </child>
         <child>
           <object class="GtkPaned" id="paned59">
-            <property name="shrink-child2">False</property>
-            <property name="resize-child2">True</property>
-            <property name="shrink-child1">False</property>
-            <property name="resize-child1">False</property>
+            <property name="shrink-child2">0</property>
+            <property name="shrink-child1">0</property>
+            <property name="resize-child1">0</property>
             <property name="can_focus">1</property>
             <child>
               <object class="GtkPaned" id="required59">
-                <property name="shrink-child2">False</property>
-                <property name="resize-child2">True</property>
-                <property name="shrink-child1">False</property>
-                <property name="resize-child1">False</property>
+                <property name="shrink-child2">0</property>
+                <property name="shrink-child1">0</property>
+                <property name="resize-child1">0</property>
                 <property name="can_focus">1</property>
                 <property name="orientation">vertical</property>
                 <child>
@@ -7253,10 +7078,9 @@
             </child>
             <child>
               <object class="GtkPaned" id="natural59">
-                <property name="shrink-child2">False</property>
-                <property name="resize-child2">True</property>
-                <property name="shrink-child1">False</property>
-                <property name="resize-child1">False</property>
+                <property name="shrink-child2">0</property>
+                <property name="shrink-child1">0</property>
+                <property name="resize-child1">0</property>
                 <property name="can_focus">1</property>
                 <property name="orientation">vertical</property>
                 <child>
@@ -7289,61 +7113,59 @@
                 </child>
               </object>
             </child>
+            <layout>
+              <property name="left_attach">4</property>
+              <property name="top_attach">59</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">4</property>
-            <property name="top_attach">59</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="wrap60">
             <property name="label" translatable="yes">True</property>
+            <layout>
+              <property name="left_attach">0</property>
+              <property name="top_attach">60</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">0</property>
-            <property name="top_attach">60</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="ellipsize60">
             <property name="label" translatable="yes">end</property>
+            <layout>
+              <property name="left_attach">1</property>
+              <property name="top_attach">60</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">1</property>
-            <property name="top_attach">60</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="width_chars60">
             <property name="label" translatable="yes">8</property>
+            <layout>
+              <property name="left_attach">2</property>
+              <property name="top_attach">60</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">2</property>
-            <property name="top_attach">60</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="max_width_chars60">
             <property name="label" translatable="yes">12</property>
+            <layout>
+              <property name="left_attach">3</property>
+              <property name="top_attach">60</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">3</property>
-            <property name="top_attach">60</property>
-          </packing>
         </child>
         <child>
           <object class="GtkPaned" id="paned60">
-            <property name="shrink-child2">False</property>
-            <property name="resize-child2">True</property>
-            <property name="shrink-child1">False</property>
-            <property name="resize-child1">False</property>
+            <property name="shrink-child2">0</property>
+            <property name="shrink-child1">0</property>
+            <property name="resize-child1">0</property>
             <property name="can_focus">1</property>
             <child>
               <object class="GtkPaned" id="required60">
-                <property name="shrink-child2">False</property>
-                <property name="resize-child2">True</property>
-                <property name="shrink-child1">False</property>
-                <property name="resize-child1">False</property>
+                <property name="shrink-child2">0</property>
+                <property name="shrink-child1">0</property>
+                <property name="resize-child1">0</property>
                 <property name="can_focus">1</property>
                 <property name="orientation">vertical</property>
                 <child>
@@ -7380,10 +7202,9 @@
             </child>
             <child>
               <object class="GtkPaned" id="natural60">
-                <property name="shrink-child2">False</property>
-                <property name="resize-child2">True</property>
-                <property name="shrink-child1">False</property>
-                <property name="resize-child1">False</property>
+                <property name="shrink-child2">0</property>
+                <property name="shrink-child1">0</property>
+                <property name="resize-child1">0</property>
                 <property name="can_focus">1</property>
                 <property name="orientation">vertical</property>
                 <child>
@@ -7418,61 +7239,59 @@
                 </child>
               </object>
             </child>
+            <layout>
+              <property name="left_attach">4</property>
+              <property name="top_attach">60</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">4</property>
-            <property name="top_attach">60</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="wrap61">
             <property name="label" translatable="yes">False</property>
+            <layout>
+              <property name="left_attach">0</property>
+              <property name="top_attach">61</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">0</property>
-            <property name="top_attach">61</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="ellipsize61">
             <property name="label" translatable="yes">none</property>
+            <layout>
+              <property name="left_attach">1</property>
+              <property name="top_attach">61</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">1</property>
-            <property name="top_attach">61</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="width_chars61">
             <property name="label" translatable="yes">12</property>
+            <layout>
+              <property name="left_attach">2</property>
+              <property name="top_attach">61</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">2</property>
-            <property name="top_attach">61</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="max_width_chars61">
             <property name="label" translatable="yes">12</property>
+            <layout>
+              <property name="left_attach">3</property>
+              <property name="top_attach">61</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">3</property>
-            <property name="top_attach">61</property>
-          </packing>
         </child>
         <child>
           <object class="GtkPaned" id="paned61">
-            <property name="shrink-child2">False</property>
-            <property name="resize-child2">True</property>
-            <property name="shrink-child1">False</property>
-            <property name="resize-child1">False</property>
+            <property name="shrink-child2">0</property>
+            <property name="shrink-child1">0</property>
+            <property name="resize-child1">0</property>
             <property name="can_focus">1</property>
             <child>
               <object class="GtkPaned" id="required61">
-                <property name="shrink-child2">False</property>
-                <property name="resize-child2">True</property>
-                <property name="shrink-child1">False</property>
-                <property name="resize-child1">False</property>
+                <property name="shrink-child2">0</property>
+                <property name="shrink-child1">0</property>
+                <property name="resize-child1">0</property>
                 <property name="can_focus">1</property>
                 <property name="orientation">vertical</property>
                 <child>
@@ -7505,10 +7324,9 @@
             </child>
             <child>
               <object class="GtkPaned" id="natural61">
-                <property name="shrink-child2">False</property>
-                <property name="resize-child2">True</property>
-                <property name="shrink-child1">False</property>
-                <property name="resize-child1">False</property>
+                <property name="shrink-child2">0</property>
+                <property name="shrink-child1">0</property>
+                <property name="resize-child1">0</property>
                 <property name="can_focus">1</property>
                 <property name="orientation">vertical</property>
                 <child>
@@ -7539,61 +7357,59 @@
                 </child>
               </object>
             </child>
+            <layout>
+              <property name="left_attach">4</property>
+              <property name="top_attach">61</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">4</property>
-            <property name="top_attach">61</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="wrap62">
             <property name="label" translatable="yes">True</property>
+            <layout>
+              <property name="left_attach">0</property>
+              <property name="top_attach">62</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">0</property>
-            <property name="top_attach">62</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="ellipsize62">
             <property name="label" translatable="yes">none</property>
+            <layout>
+              <property name="left_attach">1</property>
+              <property name="top_attach">62</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">1</property>
-            <property name="top_attach">62</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="width_chars62">
             <property name="label" translatable="yes">12</property>
+            <layout>
+              <property name="left_attach">2</property>
+              <property name="top_attach">62</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">2</property>
-            <property name="top_attach">62</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="max_width_chars62">
             <property name="label" translatable="yes">12</property>
+            <layout>
+              <property name="left_attach">3</property>
+              <property name="top_attach">62</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">3</property>
-            <property name="top_attach">62</property>
-          </packing>
         </child>
         <child>
           <object class="GtkPaned" id="paned62">
-            <property name="shrink-child2">False</property>
-            <property name="resize-child2">True</property>
-            <property name="shrink-child1">False</property>
-            <property name="resize-child1">False</property>
+            <property name="shrink-child2">0</property>
+            <property name="shrink-child1">0</property>
+            <property name="resize-child1">0</property>
             <property name="can_focus">1</property>
             <child>
               <object class="GtkPaned" id="required62">
-                <property name="shrink-child2">False</property>
-                <property name="resize-child2">True</property>
-                <property name="shrink-child1">False</property>
-                <property name="resize-child1">False</property>
+                <property name="shrink-child2">0</property>
+                <property name="shrink-child1">0</property>
+                <property name="resize-child1">0</property>
                 <property name="can_focus">1</property>
                 <property name="orientation">vertical</property>
                 <child>
@@ -7628,10 +7444,9 @@
             </child>
             <child>
               <object class="GtkPaned" id="natural62">
-                <property name="shrink-child2">False</property>
-                <property name="resize-child2">True</property>
-                <property name="shrink-child1">False</property>
-                <property name="resize-child1">False</property>
+                <property name="shrink-child2">0</property>
+                <property name="shrink-child1">0</property>
+                <property name="resize-child1">0</property>
                 <property name="can_focus">1</property>
                 <property name="orientation">vertical</property>
                 <child>
@@ -7664,61 +7479,59 @@
                 </child>
               </object>
             </child>
+            <layout>
+              <property name="left_attach">4</property>
+              <property name="top_attach">62</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">4</property>
-            <property name="top_attach">62</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="wrap63">
             <property name="label" translatable="yes">False</property>
+            <layout>
+              <property name="left_attach">0</property>
+              <property name="top_attach">63</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">0</property>
-            <property name="top_attach">63</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="ellipsize63">
             <property name="label" translatable="yes">end</property>
+            <layout>
+              <property name="left_attach">1</property>
+              <property name="top_attach">63</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">1</property>
-            <property name="top_attach">63</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="width_chars63">
             <property name="label" translatable="yes">12</property>
+            <layout>
+              <property name="left_attach">2</property>
+              <property name="top_attach">63</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">2</property>
-            <property name="top_attach">63</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="max_width_chars63">
             <property name="label" translatable="yes">12</property>
+            <layout>
+              <property name="left_attach">3</property>
+              <property name="top_attach">63</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">3</property>
-            <property name="top_attach">63</property>
-          </packing>
         </child>
         <child>
           <object class="GtkPaned" id="paned63">
-            <property name="shrink-child2">False</property>
-            <property name="resize-child2">True</property>
-            <property name="shrink-child1">False</property>
-            <property name="resize-child1">False</property>
+            <property name="shrink-child2">0</property>
+            <property name="shrink-child1">0</property>
+            <property name="resize-child1">0</property>
             <property name="can_focus">1</property>
             <child>
               <object class="GtkPaned" id="required63">
-                <property name="shrink-child2">False</property>
-                <property name="resize-child2">True</property>
-                <property name="shrink-child1">False</property>
-                <property name="resize-child1">False</property>
+                <property name="shrink-child2">0</property>
+                <property name="shrink-child1">0</property>
+                <property name="resize-child1">0</property>
                 <property name="can_focus">1</property>
                 <property name="orientation">vertical</property>
                 <child>
@@ -7753,10 +7566,9 @@
             </child>
             <child>
               <object class="GtkPaned" id="natural63">
-                <property name="shrink-child2">False</property>
-                <property name="resize-child2">True</property>
-                <property name="shrink-child1">False</property>
-                <property name="resize-child1">False</property>
+                <property name="shrink-child2">0</property>
+                <property name="shrink-child1">0</property>
+                <property name="resize-child1">0</property>
                 <property name="can_focus">1</property>
                 <property name="orientation">vertical</property>
                 <child>
@@ -7789,61 +7601,59 @@
                 </child>
               </object>
             </child>
+            <layout>
+              <property name="left_attach">4</property>
+              <property name="top_attach">63</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">4</property>
-            <property name="top_attach">63</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="wrap64">
             <property name="label" translatable="yes">True</property>
+            <layout>
+              <property name="left_attach">0</property>
+              <property name="top_attach">64</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">0</property>
-            <property name="top_attach">64</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="ellipsize64">
             <property name="label" translatable="yes">end</property>
+            <layout>
+              <property name="left_attach">1</property>
+              <property name="top_attach">64</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">1</property>
-            <property name="top_attach">64</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="width_chars64">
             <property name="label" translatable="yes">12</property>
+            <layout>
+              <property name="left_attach">2</property>
+              <property name="top_attach">64</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">2</property>
-            <property name="top_attach">64</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="max_width_chars64">
             <property name="label" translatable="yes">12</property>
+            <layout>
+              <property name="left_attach">3</property>
+              <property name="top_attach">64</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">3</property>
-            <property name="top_attach">64</property>
-          </packing>
         </child>
         <child>
           <object class="GtkPaned" id="paned64">
-            <property name="shrink-child2">False</property>
-            <property name="resize-child2">True</property>
-            <property name="shrink-child1">False</property>
-            <property name="resize-child1">False</property>
+            <property name="shrink-child2">0</property>
+            <property name="shrink-child1">0</property>
+            <property name="resize-child1">0</property>
             <property name="can_focus">1</property>
             <child>
               <object class="GtkPaned" id="required64">
-                <property name="shrink-child2">False</property>
-                <property name="resize-child2">True</property>
-                <property name="shrink-child1">False</property>
-                <property name="resize-child1">False</property>
+                <property name="shrink-child2">0</property>
+                <property name="shrink-child1">0</property>
+                <property name="resize-child1">0</property>
                 <property name="can_focus">1</property>
                 <property name="orientation">vertical</property>
                 <child>
@@ -7880,10 +7690,9 @@
             </child>
             <child>
               <object class="GtkPaned" id="natural64">
-                <property name="shrink-child2">False</property>
-                <property name="resize-child2">True</property>
-                <property name="shrink-child1">False</property>
-                <property name="resize-child1">False</property>
+                <property name="shrink-child2">0</property>
+                <property name="shrink-child1">0</property>
+                <property name="resize-child1">0</property>
                 <property name="can_focus">1</property>
                 <property name="orientation">vertical</property>
                 <child>
@@ -7918,11 +7727,11 @@
                 </child>
               </object>
             </child>
+            <layout>
+              <property name="left_attach">4</property>
+              <property name="top_attach">64</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">4</property>
-            <property name="top_attach">64</property>
-          </packing>
         </child>
       </object>
     </child>

diff --git a/testsuite/reftests/label-small-ellipsized.ref.ui b/testsuite/reftests/label-small-ellipsized.ref.ui
index 03285d0664d30ee17c4db09c196950d5ca61510d..bb047f0a15823fc3b2403e0be1dcc42cbe4e6d26 100644 (file)
--- a/testsuite/reftests/label-small-ellipsized.ref.ui
+++ b/testsuite/reftests/label-small-ellipsized.ref.ui
@@ -1,13 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
-  <!-- interface-requires gtk+ 3.0 -->
   <object class="GtkWindow" id="window1">
-    <property name="can_focus">False</property>
     <property name="type">popup</property>
     <child>
       <object class="GtkLabel" id="label1">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
         <property name="label" translatable="yes"> </property>
       </object>
     </child>

diff --git a/testsuite/reftests/label-small-ellipsized.ui b/testsuite/reftests/label-small-ellipsized.ui
index 16f45fc31cba38c14f9eae0b52ba83396b41a2be..260149d2c1ba03ef2fa3068fa214a0cb14daa9ce 100644 (file)
--- a/testsuite/reftests/label-small-ellipsized.ui
+++ b/testsuite/reftests/label-small-ellipsized.ui
@@ -1,13 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
-  <!-- interface-requires gtk+ 3.0 -->
   <object class="GtkWindow" id="window1">
-    <property name="can_focus">False</property>
     <property name="type">popup</property>
     <child>
       <object class="GtkLabel" id="label1">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
         <property name="label" translatable="yes"> </property>
         <property name="ellipsize">end</property>
       </object>

diff --git a/testsuite/reftests/label-text-shadow-changes-modify-clip.ref.ui b/testsuite/reftests/label-text-shadow-changes-modify-clip.ref.ui
index 85245c16fe8a76f52a388cad0b27a76735fdb7ec..b92d933f4811998f2c4e309294c455dbae57fde1 100644 (file)
--- a/testsuite/reftests/label-text-shadow-changes-modify-clip.ref.ui
+++ b/testsuite/reftests/label-text-shadow-changes-modify-clip.ref.ui
@@ -1,16 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!-- Generated with glade 3.18.1 -->
 <interface>
   <requires lib="gtk+" version="3.12"/>
   <object class="GtkWindow" id="window1">
     <property name="width_request">500</property>
     <property name="height_request">100</property>
-    <property name="can_focus">False</property>
     <property name="type">popup</property>
     <child>
       <object class="GtkLabel" id="label1">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
         <property name="label" translatable="yes">Hello World</property>
         <style>
           <class name="reference"/>

diff --git a/testsuite/reftests/label-text-shadow-changes-modify-clip.ui b/testsuite/reftests/label-text-shadow-changes-modify-clip.ui
index bb34bb001ee0dc9aa0cc23bc7535204f12ad7f4f..f69a6905604364b55ad3a4f02d2faaea6ffc35ff 100644 (file)
--- a/testsuite/reftests/label-text-shadow-changes-modify-clip.ui
+++ b/testsuite/reftests/label-text-shadow-changes-modify-clip.ui
@@ -1,24 +1,18 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!-- Generated with glade 3.18.1 -->
 <interface>
   <requires lib="gtk+" version="3.12"/>
   <object class="GtkWindow" id="window1">
     <property name="width_request">500</property>
     <property name="height_request">100</property>
-    <property name="can_focus">False</property>
     <property name="type">popup</property>
     <signal name="map" handler="reftest:inhibit_for_3_frames" swapped="no"/>
     <child>
       <object class="GtkBox" id="box2">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
         <property name="halign">center</property>
         <property name="valign">center</property>
         <property name="orientation">vertical</property>
         <child>
           <object class="GtkLabel" id="label1">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="label" translatable="yes">Hello World</property>
             <signal name="map" handler="reftest:add_reference_class_if_no_animation" swapped="no"/>
           </object>

diff --git a/testsuite/reftests/label-text-shadow-clipping.ref.ui b/testsuite/reftests/label-text-shadow-clipping.ref.ui
index c8fa83829901639df256d1f79e1a3e7fbc39f950..1b0ddf015aafc9d8d453b4c9433f396758bba647 100644 (file)
--- a/testsuite/reftests/label-text-shadow-clipping.ref.ui
+++ b/testsuite/reftests/label-text-shadow-clipping.ref.ui
@@ -1,16 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!-- Generated with glade 3.18.1 -->
 <interface>
   <requires lib="gtk+" version="3.12"/>
   <object class="GtkWindow" id="window1">
     <property name="width_request">500</property>
     <property name="height_request">100</property>
-    <property name="can_focus">False</property>
     <property name="type">popup</property>
     <child>
       <object class="GtkLabel" id="label1">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
         <property name="label" translatable="yes">Hello World</property>
       </object>
     </child>

diff --git a/testsuite/reftests/label-text-shadow-clipping.ui b/testsuite/reftests/label-text-shadow-clipping.ui
index 2ff0b4b53d4f5fc0863d1a08cb02220387833be7..0e4873a3d0ac916cff4d52c152516fd72b3a918c 100644 (file)
--- a/testsuite/reftests/label-text-shadow-clipping.ui
+++ b/testsuite/reftests/label-text-shadow-clipping.ui
@@ -1,23 +1,17 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!-- Generated with glade 3.18.1 -->
 <interface>
   <requires lib="gtk+" version="3.12"/>
   <object class="GtkWindow" id="window1">
     <property name="width_request">500</property>
     <property name="height_request">100</property>
-    <property name="can_focus">False</property>
     <property name="type">popup</property>
     <child>
       <object class="GtkBox" id="box2">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
         <property name="halign">center</property>
         <property name="valign">center</property>
         <property name="orientation">vertical</property>
         <child>
           <object class="GtkLabel" id="label1">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="label" translatable="yes">Hello World</property>
           </object>
         </child>

diff --git a/testsuite/reftests/label-width-chars-dont-shrink.ref.ui b/testsuite/reftests/label-width-chars-dont-shrink.ref.ui
index 302efb825cd3efbe0b6c14b418384be98faec43e..852813ec0ef892e14ffb2b42e9f810ef74c39ba1 100644 (file)
--- a/testsuite/reftests/label-width-chars-dont-shrink.ref.ui
+++ b/testsuite/reftests/label-width-chars-dont-shrink.ref.ui
@@ -1,32 +1,22 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
-  <!-- interface-requires gtk+ 3.0 -->
   <object class="GtkWindow" id="window1">
-    <property name="can_focus">False</property>
     <property name="type">popup</property>
     <child>
       <object class="GtkBox" id="box1">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
         <property name="orientation">vertical</property>
         <child>
           <object class="GtkLabel" id="label1">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="label" translatable="yes">Hello World</property>
           </object>
         </child>
         <child>
           <object class="GtkLabel" id="label2">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="label" translatable="yes">Hello World</property>
           </object>
         </child>
         <child>
           <object class="GtkLabel" id="label3">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="label" translatable="yes">Hello World</property>
           </object>
         </child>

diff --git a/testsuite/reftests/label-width-chars-dont-shrink.ui b/testsuite/reftests/label-width-chars-dont-shrink.ui
index d16e4905d29db2de751cc577c752f63af54419e9..89f4631e1b1ffae0ce504a6c29c0af45630e6590 100644 (file)
--- a/testsuite/reftests/label-width-chars-dont-shrink.ui
+++ b/testsuite/reftests/label-width-chars-dont-shrink.ui
@@ -1,33 +1,23 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
-  <!-- interface-requires gtk+ 3.0 -->
   <object class="GtkWindow" id="window1">
-    <property name="can_focus">False</property>
     <property name="type">popup</property>
     <child>
       <object class="GtkBox" id="box1">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
         <property name="orientation">vertical</property>
         <child>
           <object class="GtkLabel" id="label1">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="label" translatable="yes">Hello World</property>
           </object>
         </child>
         <child>
           <object class="GtkLabel" id="label2">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="label" translatable="yes">Hello World</property>
             <property name="max_width_chars">5</property>
           </object>
         </child>
         <child>
           <object class="GtkLabel" id="label3">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="label" translatable="yes">Hello World</property>
             <property name="width_chars">5</property>
           </object>

diff --git a/testsuite/reftests/label-wrap-justify.ref.ui b/testsuite/reftests/label-wrap-justify.ref.ui
index 8c8dbd9ffeaf67fedb4ba4470c86d46880bb6e2b..a52a604f24b0311ee3dc1781d21da281555163c4 100644 (file)
--- a/testsuite/reftests/label-wrap-justify.ref.ui
+++ b/testsuite/reftests/label-wrap-justify.ref.ui
@@ -1,71 +1,59 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
-  <!-- interface-requires gtk+ 3.0 -->
   <object class="GtkWindow" id="window1">
-    <property name="can_focus">False</property>
     <property name="type">popup</property>
     <child>
       <object class="GtkGrid" id="grid1">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
         <child>
           <object class="GtkLabel" id="label1">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="label" translatable="yes">&lt;tt&gt;left
 aligning&lt;/tt&gt;</property>
-            <property name="use_markup">True</property>
+            <property name="use_markup">1</property>
+            <layout>
+              <property name="left_attach">0</property>
+              <property name="top_attach">0</property>
+              <property name="column-span">1</property>
+              <property name="row-span">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">0</property>
-            <property name="top_attach">0</property>
-            <property name="width">1</property>
-            <property name="height">1</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="label2">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="label" translatable="yes">&lt;tt&gt; center
 aligning&lt;/tt&gt;</property>
-            <property name="use_markup">True</property>
+            <property name="use_markup">1</property>
+            <layout>
+              <property name="left_attach">0</property>
+              <property name="top_attach">1</property>
+              <property name="column-span">1</property>
+              <property name="row-span">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">0</property>
-            <property name="top_attach">1</property>
-            <property name="width">1</property>
-            <property name="height">1</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="label3">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="label" translatable="yes">&lt;tt&gt;   right
 aligning&lt;/tt&gt;</property>
-            <property name="use_markup">True</property>
+            <property name="use_markup">1</property>
+            <layout>
+              <property name="left_attach">0</property>
+              <property name="top_attach">2</property>
+              <property name="column-span">1</property>
+              <property name="row-span">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">0</property>
-            <property name="top_attach">2</property>
-            <property name="width">1</property>
-            <property name="height">1</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="label4">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="label" translatable="yes">&lt;tt&gt;Make the widget wide enough&lt;/tt&gt;</property>
-            <property name="use_markup">True</property>
+            <property name="use_markup">1</property>
+            <layout>
+              <property name="left_attach">0</property>
+              <property name="top_attach">3</property>
+              <property name="column-span">1</property>
+              <property name="row-span">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">0</property>
-            <property name="top_attach">3</property>
-            <property name="width">1</property>
-            <property name="height">1</property>
-          </packing>
         </child>
       </object>
     </child>

diff --git a/testsuite/reftests/label-wrap-justify.ui b/testsuite/reftests/label-wrap-justify.ui
index 31350a202ae0c4099931f7241bd9c74b54ffdfbd..38d0597ac4b3f22d6372f7148fdb5319c57e2510 100644 (file)
--- a/testsuite/reftests/label-wrap-justify.ui
+++ b/testsuite/reftests/label-wrap-justify.ui
@@ -1,76 +1,64 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
-  <!-- interface-requires gtk+ 3.0 -->
   <object class="GtkWindow" id="window1">
-    <property name="can_focus">False</property>
     <property name="type">popup</property>
     <child>
       <object class="GtkGrid" id="grid1">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
         <child>
           <object class="GtkLabel" id="label1">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="label" translatable="yes">&lt;tt&gt;left
 aligning&lt;/tt&gt;</property>
-            <property name="use_markup">True</property>
-            <property name="wrap">True</property>
+            <property name="use_markup">1</property>
+            <property name="wrap">1</property>
+            <layout>
+              <property name="left_attach">0</property>
+              <property name="top_attach">0</property>
+              <property name="column-span">1</property>
+              <property name="row-span">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">0</property>
-            <property name="top_attach">0</property>
-            <property name="width">1</property>
-            <property name="height">1</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="label2">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="label" translatable="yes">&lt;tt&gt;center
 aligning&lt;/tt&gt;</property>
-            <property name="use_markup">True</property>
+            <property name="use_markup">1</property>
             <property name="justify">center</property>
-            <property name="wrap">True</property>
+            <property name="wrap">1</property>
+            <layout>
+              <property name="left_attach">0</property>
+              <property name="top_attach">1</property>
+              <property name="column-span">1</property>
+              <property name="row-span">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">0</property>
-            <property name="top_attach">1</property>
-            <property name="width">1</property>
-            <property name="height">1</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="label3">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="label" translatable="yes">&lt;tt&gt;right
 aligning&lt;/tt&gt;</property>
-            <property name="use_markup">True</property>
+            <property name="use_markup">1</property>
             <property name="justify">right</property>
-            <property name="wrap">True</property>
+            <property name="wrap">1</property>
+            <layout>
+              <property name="left_attach">0</property>
+              <property name="top_attach">2</property>
+              <property name="column-span">1</property>
+              <property name="row-span">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">0</property>
-            <property name="top_attach">2</property>
-            <property name="width">1</property>
-            <property name="height">1</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="label4">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="label" translatable="yes">&lt;tt&gt;Make the widget wide enough&lt;/tt&gt;</property>
-            <property name="use_markup">True</property>
+            <property name="use_markup">1</property>
+            <layout>
+              <property name="left_attach">0</property>
+              <property name="top_attach">3</property>
+              <property name="column-span">1</property>
+              <property name="row-span">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">0</property>
-            <property name="top_attach">3</property>
-            <property name="width">1</property>
-            <property name="height">1</property>
-          </packing>
         </child>
       </object>
     </child>

diff --git a/testsuite/reftests/letter-spacing.ref.ui b/testsuite/reftests/letter-spacing.ref.ui
index f1925ba953879341e5e5814c4ee62a6279e5d97d..491cecd1299ab8c5056017bd590e7b1ee313b20c 100644 (file)
--- a/testsuite/reftests/letter-spacing.ref.ui
+++ b/testsuite/reftests/letter-spacing.ref.ui
@@ -1,14 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!-- Generated with glade 3.18.1 -->
 <interface>
   <requires lib="gtk+" version="3.0"/>
   <object class="GtkWindow" id="window1">
-    <property name="can_focus">False</property>
     <property name="type">popup</property>
     <child>
       <object class="GtkLabel" id="label1">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
         <property name="label">abc</property>
         <signal name="map" handler="reftest:set_letter_spacing" swapped="no"/>
       </object>

diff --git a/testsuite/reftests/letter-spacing.ui b/testsuite/reftests/letter-spacing.ui
index f93785fee47e004384d06ad17d1eeef954a3bbb4..6ab4185af9be38b07bdeb0e26ac19908fbd15c40 100644 (file)
--- a/testsuite/reftests/letter-spacing.ui
+++ b/testsuite/reftests/letter-spacing.ui
@@ -1,14 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
-  <!-- interface-requires gtk+ 3.0 -->
   <object class="GtkWindow" id="window1">
-    <property name="can_focus">False</property>
     <property name="type">popup</property>
     <child>
       <object class="GtkLabel" id="label1">
         <property name="name">spaced</property>
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
         <property name="label">abc</property>
       </object>
     </child>

diff --git a/testsuite/reftests/linear-gradient-transition-to-other.ref.ui b/testsuite/reftests/linear-gradient-transition-to-other.ref.ui
index c4a02a119255ca8d3474cc043e1d016afb8d7cf7..489098df2db191f0dae08f3da8428c116aef3229 100644 (file)
--- a/testsuite/reftests/linear-gradient-transition-to-other.ref.ui
+++ b/testsuite/reftests/linear-gradient-transition-to-other.ref.ui
@@ -1,10 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
-  <!-- interface-requires gtk+ 3.0 -->
   <object class="GtkWindow" id="window1">
     <property name="width_request">20</property>
     <property name="height_request">20</property>
-    <property name="can_focus">False</property>
     <property name="type">popup</property>
     <property name="name">reference</property>
   </object>

diff --git a/testsuite/reftests/linear-gradient-transition-to-other.ui b/testsuite/reftests/linear-gradient-transition-to-other.ui
index 2c21f60fbf54a6f5d7eaff272e1eca693a878fd6..6fa417228a45a3ab972d7844fb121b2e890a57df 100644 (file)
--- a/testsuite/reftests/linear-gradient-transition-to-other.ui
+++ b/testsuite/reftests/linear-gradient-transition-to-other.ui
@@ -1,10 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
-  <!-- interface-requires gtk+ 3.0 -->
   <object class="GtkWindow" id="window1">
     <property name="width_request">20</property>
     <property name="height_request">20</property>
-    <property name="can_focus">False</property>
     <property name="type">popup</property>
   </object>
 </interface>

diff --git a/testsuite/reftests/linear-gradient.ref.ui b/testsuite/reftests/linear-gradient.ref.ui
index 62137e8c3c7ef35d2acdb6e309888c5a5f4a79a8..27f85476a34b9591385ff43abedffaf7d8b6b579 100644 (file)
--- a/testsuite/reftests/linear-gradient.ref.ui
+++ b/testsuite/reftests/linear-gradient.ref.ui
@@ -1,22 +1,17 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
-  <!-- interface-requires gtk+ 3.0 -->
   <object class="GtkWindow" id="window1">
-    <property name="can_focus">False</property>
     <property name="type">popup</property>
     <child>
       <object class="GtkBox" id="box1">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
         <property name="orientation">vertical</property>
         <property name="name">reference</property>
         <child>
           <object class="GtkButton" id="button1">
             <property name="width_request">40</property>
             <property name="height_request">30</property>
-            <property name="visible">True</property>
-            <property name="can_focus">True</property>
-            <property name="receives_default">True</property>
+            <property name="can_focus">1</property>
+            <property name="receives_default">1</property>
             <property name="name">a</property>
           </object>
         </child>
@@ -24,9 +19,8 @@
           <object class="GtkButton" id="button2">
             <property name="width_request">40</property>
             <property name="height_request">30</property>
-            <property name="visible">True</property>
-            <property name="can_focus">True</property>
-            <property name="receives_default">True</property>
+            <property name="can_focus">1</property>
+            <property name="receives_default">1</property>
             <property name="name">b</property>
           </object>
         </child>
@@ -34,9 +28,8 @@
           <object class="GtkButton" id="button3">
             <property name="width_request">40</property>
             <property name="height_request">30</property>
-            <property name="visible">True</property>
-            <property name="can_focus">True</property>
-            <property name="receives_default">True</property>
+            <property name="can_focus">1</property>
+            <property name="receives_default">1</property>
             <property name="name">c</property>
           </object>
         </child>
@@ -44,9 +37,8 @@
           <object class="GtkButton" id="button4">
             <property name="width_request">40</property>
             <property name="height_request">30</property>
-            <property name="visible">True</property>
-            <property name="can_focus">True</property>
-            <property name="receives_default">True</property>
+            <property name="can_focus">1</property>
+            <property name="receives_default">1</property>
             <property name="name">d</property>
           </object>
         </child>

diff --git a/testsuite/reftests/linear-gradient.ui b/testsuite/reftests/linear-gradient.ui
index 9752754d6d931825e4e396b9ee0cc60a35ba4383..e2fbdc69499c095e0159f06e525ab8b9528e73e3 100644 (file)
--- a/testsuite/reftests/linear-gradient.ui
+++ b/testsuite/reftests/linear-gradient.ui
@@ -1,21 +1,16 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
-  <!-- interface-requires gtk+ 3.0 -->
   <object class="GtkWindow" id="window1">
-    <property name="can_focus">False</property>
     <property name="type">popup</property>
     <child>
       <object class="GtkBox" id="box1">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
         <property name="orientation">vertical</property>
         <child>
           <object class="GtkButton" id="button1">
             <property name="width_request">40</property>
             <property name="height_request">30</property>
-            <property name="visible">True</property>
-            <property name="can_focus">True</property>
-            <property name="receives_default">True</property>
+            <property name="can_focus">1</property>
+            <property name="receives_default">1</property>
             <property name="name">a</property>
           </object>
         </child>
@@ -23,9 +18,8 @@
           <object class="GtkButton" id="button2">
             <property name="width_request">40</property>
             <property name="height_request">30</property>
-            <property name="visible">True</property>
-            <property name="can_focus">True</property>
-            <property name="receives_default">True</property>
+            <property name="can_focus">1</property>
+            <property name="receives_default">1</property>
             <property name="name">b</property>
           </object>
         </child>
@@ -33,9 +27,8 @@
           <object class="GtkButton" id="button3">
             <property name="width_request">40</property>
             <property name="height_request">30</property>
-            <property name="visible">True</property>
-            <property name="can_focus">True</property>
-            <property name="receives_default">True</property>
+            <property name="can_focus">1</property>
+            <property name="receives_default">1</property>
             <property name="name">c</property>
           </object>
         </child>
@@ -43,9 +36,8 @@
           <object class="GtkButton" id="button4">
             <property name="width_request">40</property>
             <property name="height_request">30</property>
-            <property name="visible">True</property>
-            <property name="can_focus">True</property>
-            <property name="receives_default">True</property>
+            <property name="can_focus">1</property>
+            <property name="receives_default">1</property>
             <property name="name">d</property>
           </object>
         </child>

diff --git a/testsuite/reftests/link-coloring.ref.ui b/testsuite/reftests/link-coloring.ref.ui
index 7848a118816b23f818d2aa83ea3f876d9b344749..882e737e150092123b62c013305dde69f204be4c 100644 (file)
--- a/testsuite/reftests/link-coloring.ref.ui
+++ b/testsuite/reftests/link-coloring.ref.ui
@@ -1,37 +1,26 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!-- Generated with glade 3.16.0 on Mon Nov  4 16:28:50 2013 -->
 <interface>
-  <!-- interface-requires gtk+ 3.10 -->
   <object class="GtkWindow" id="window1">
-    <property name="can_focus">False</property>
     <property name="type">popup</property>
     <child>
       <object class="GtkBox" id="box1">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
         <property name="orientation">vertical</property>
         <child>
           <object class="GtkLabel" id="label1">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
-            <property name="label" translatable="yes">A &lt;span color="blue" underline="single"&gt;link&lt;/span&gt; to the &lt;span color="blue" underline="single"&gt;GNOME&lt;/span&gt; website</property>
-            <property name="use_markup">True</property>
+            <property name="label" translatable="yes">A &lt;span color=&quot;blue&quot; underline=&quot;single&quot;&gt;link&lt;/span&gt; to the &lt;span color=&quot;blue&quot; underline=&quot;single&quot;&gt;GNOME&lt;/span&gt; website</property>
+            <property name="use_markup">1</property>
           </object>
         </child>
         <child>
           <object class="GtkLabel" id="label2">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
-            <property name="label" translatable="yes">&lt;span color="blue" underline="single"&gt;A normal link&lt;/span&gt;</property>
-            <property name="use_markup">True</property>
+            <property name="label" translatable="yes">&lt;span color=&quot;blue&quot; underline=&quot;single&quot;&gt;A normal link&lt;/span&gt;</property>
+            <property name="use_markup">1</property>
           </object>
         </child>
         <child>
           <object class="GtkLabel" id="label3">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
-            <property name="label" translatable="yes">&lt;span color="purple" underline="single"&gt;A visited link&lt;/span&gt;</property>
-            <property name="use_markup">True</property>
+            <property name="label" translatable="yes">&lt;span color=&quot;purple&quot; underline=&quot;single&quot;&gt;A visited link&lt;/span&gt;</property>
+            <property name="use_markup">1</property>
           </object>
         </child>
       </object>

diff --git a/testsuite/reftests/link-coloring.ui b/testsuite/reftests/link-coloring.ui
index 610287e9fe435d17c1adbdd9f53ac39e69b49028..8d6ff5bcd68bb6d31ca0067c12f047e1abe7e239 100644 (file)
--- a/testsuite/reftests/link-coloring.ui
+++ b/testsuite/reftests/link-coloring.ui
@@ -1,29 +1,22 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!-- Generated with glade 3.16.0 on Mon Nov  4 13:29:25 2013 -->
 <interface>
-  <!-- interface-requires gtk+ 3.10 -->
   <object class="GtkWindow" id="window1">
-    <property name="can_focus">False</property>
     <property name="type">popup</property>
     <child>
       <object class="GtkBox" id="box1">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
         <property name="orientation">vertical</property>
         <child>
           <object class="GtkLabel" id="label1">
-            <property name="visible">True</property>
-            <property name="can_focus">True</property>
-            <property name="label" translatable="yes">A &lt;a href="http://www.gnome.org"&gt;link&lt;/a&gt; to the &lt;a href="http://www.gnome.org"&gt;GNOME&lt;/a&gt; website</property>
-            <property name="use_markup">True</property>
+            <property name="can_focus">1</property>
+            <property name="label" translatable="yes">A &lt;a href=&quot;http://www.gnome.org&quot;&gt;link&lt;/a&gt; to the &lt;a href=&quot;http://www.gnome.org&quot;&gt;GNOME&lt;/a&gt; website</property>
+            <property name="use_markup">1</property>
           </object>
         </child>
         <child>
           <object class="GtkLinkButton" id="linkbutton1">
             <property name="label" translatable="yes">A normal link</property>
-            <property name="visible">True</property>
-            <property name="can_focus">True</property>
-            <property name="receives_default">True</property>
+            <property name="can_focus">1</property>
+            <property name="receives_default">1</property>
             <property name="relief">none</property>
             <property name="uri">http://gnome.org</property>
           </object>
@@ -31,12 +24,11 @@
         <child>
           <object class="GtkLinkButton" id="linkbutton2">
             <property name="label" translatable="yes">A visited link</property>
-            <property name="visible">True</property>
-            <property name="can_focus">True</property>
-            <property name="receives_default">True</property>
+            <property name="can_focus">1</property>
+            <property name="receives_default">1</property>
             <property name="relief">none</property>
             <property name="uri">http://gnome.org</property>
-            <property name="visited">True</property>
+            <property name="visited">1</property>
           </object>
         </child>
       </object>

diff --git a/testsuite/reftests/messagedialog-secondarytext.ref.ui b/testsuite/reftests/messagedialog-secondarytext.ref.ui
index a85e7228ec0e597c9ab9b5df0a4976d8b88db309..5856b837fed62653b314de19ef9170473532957b 100644 (file)
--- a/testsuite/reftests/messagedialog-secondarytext.ref.ui
+++ b/testsuite/reftests/messagedialog-secondarytext.ref.ui
@@ -1,11 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
-  <!-- interface-requires gtk+ 3.0 -->
   <object class="GtkMessageDialog" id="messagedialog1">
-    <property name="can_focus">False</property>
     <property name="type">popup</property>
     <property name="type_hint">dialog</property>
-    <property name="skip_taskbar_hint">True</property>
+    <property name="skip_taskbar_hint">1</property>
     <property name="buttons">ok</property>
     <property name="text" translatable="yes">Text</property>
     <property name="secondary_text" translatable="yes">Secondary text #5</property>

diff --git a/testsuite/reftests/messagedialog-secondarytext.ui b/testsuite/reftests/messagedialog-secondarytext.ui
index 7c9be82bdbd218a8454ed13347bc94a8aa87ceb0..f25df315158c293014b0da19e9c32824a7c34093 100644 (file)
--- a/testsuite/reftests/messagedialog-secondarytext.ui
+++ b/testsuite/reftests/messagedialog-secondarytext.ui
@@ -1,14 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
-  <!-- interface-requires gtk+ 3.0 -->
   <object class="GtkMessageDialog" id="messagedialog1">
-    <property name="can_focus">False</property>
     <property name="type">popup</property>
     <property name="type_hint">dialog</property>
-    <property name="skip_taskbar_hint">True</property>
+    <property name="skip_taskbar_hint">1</property>
     <property name="buttons">ok</property>
     <property name="text" translatable="yes">Text</property>
-    <!-- We set the property multiple times on purpose here -->
     <property name="secondary_text" translatable="yes">Secondary text #1</property>
     <property name="secondary_text" translatable="yes">Secondary text #2</property>
     <property name="secondary_text" translatable="yes">Secondary text #3</property>

diff --git a/testsuite/reftests/named-colors.ref.ui b/testsuite/reftests/named-colors.ref.ui
index 3128b25456bc242865429634091c06f6d1be4f36..6bbb850534641810134891eaf6f96e661aa3ee6a 100644 (file)
--- a/testsuite/reftests/named-colors.ref.ui
+++ b/testsuite/reftests/named-colors.ref.ui
@@ -1,2262 +1,1958 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
-  <!-- interface-requires gtk+ 3.0 -->
   <object class="GtkWindow" id="window1">
-    <property name="can_focus">False</property>
     <property name="type">popup</property>
     <child>
       <object class="GtkGrid" id="grid0">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
         <child>
           <object class="GtkLabel" id="label0">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="ellipsize">end</property>
             <property name="label" translatable="yes">XXX</property>
             <property name="name">reference0</property>
+            <layout>
+              <property name="left_attach">0</property>
+              <property name="top_attach">0</property>
+              <property name="column-span">1</property>
+              <property name="row-span">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">0</property>
-            <property name="top_attach">0</property>
-            <property name="width">1</property>
-            <property name="height">1</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="label10">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="ellipsize">end</property>
             <property name="label" translatable="yes">XXX</property>
             <property name="name">reference10</property>
+            <layout>
+              <property name="left_attach">1</property>
+              <property name="top_attach">0</property>
+              <property name="column-span">1</property>
+              <property name="row-span">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">1</property>
-            <property name="top_attach">0</property>
-            <property name="width">1</property>
-            <property name="height">1</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="label20">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="ellipsize">end</property>
             <property name="label" translatable="yes">XXX</property>
             <property name="name">reference20</property>
+            <layout>
+              <property name="left_attach">2</property>
+              <property name="top_attach">0</property>
+              <property name="column-span">1</property>
+              <property name="row-span">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">2</property>
-            <property name="top_attach">0</property>
-            <property name="width">1</property>
-            <property name="height">1</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="label30">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="ellipsize">end</property>
             <property name="label" translatable="yes">XXX</property>
             <property name="name">reference30</property>
+            <layout>
+              <property name="left_attach">3</property>
+              <property name="top_attach">0</property>
+              <property name="column-span">1</property>
+              <property name="row-span">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">3</property>
-            <property name="top_attach">0</property>
-            <property name="width">1</property>
-            <property name="height">1</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="label40">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="ellipsize">end</property>
             <property name="label" translatable="yes">XXX</property>
             <property name="name">reference40</property>
+            <layout>
+              <property name="left_attach">4</property>
+              <property name="top_attach">0</property>
+              <property name="column-span">1</property>
+              <property name="row-span">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">4</property>
-            <property name="top_attach">0</property>
-            <property name="width">1</property>
-            <property name="height">1</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="label50">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="ellipsize">end</property>
             <property name="label" translatable="yes">XXX</property>
             <property name="name">reference50</property>
+            <layout>
+              <property name="left_attach">5</property>
+              <property name="top_attach">0</property>
+              <property name="column-span">1</property>
+              <property name="row-span">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">5</property>
-            <property name="top_attach">0</property>
-            <property name="width">1</property>
-            <property name="height">1</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="label60">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="ellipsize">end</property>
             <property name="label" translatable="yes">XXX</property>
             <property name="name">reference60</property>
+            <layout>
+              <property name="left_attach">6</property>
+              <property name="top_attach">0</property>
+              <property name="column-span">1</property>
+              <property name="row-span">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">6</property>
-            <property name="top_attach">0</property>
-            <property name="width">1</property>
-            <property name="height">1</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="label70">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="ellipsize">end</property>
             <property name="label" translatable="yes">XXX</property>
             <property name="name">reference70</property>
+            <layout>
+              <property name="left_attach">7</property>
+              <property name="top_attach">0</property>
+              <property name="column-span">1</property>
+              <property name="row-span">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">7</property>
-            <property name="top_attach">0</property>
-            <property name="width">1</property>
-            <property name="height">1</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="label80">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="ellipsize">end</property>
             <property name="label" translatable="yes">XXX</property>
             <property name="name">reference80</property>
+            <layout>
+              <property name="left_attach">8</property>
+              <property name="top_attach">0</property>
+              <property name="column-span">1</property>
+              <property name="row-span">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">8</property>
-            <property name="top_attach">0</property>
-            <property name="width">1</property>
-            <property name="height">1</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="label90">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="ellipsize">end</property>
             <property name="label" translatable="yes">XXX</property>
             <property name="name">reference90</property>
+            <layout>
+              <property name="left_attach">9</property>
+              <property name="top_attach">0</property>
+              <property name="column-span">1</property>
+              <property name="row-span">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">9</property>
-            <property name="top_attach">0</property>
-            <property name="width">1</property>
-            <property name="height">1</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="label100">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="ellipsize">end</property>
             <property name="label" translatable="yes">XXX</property>
             <property name="name">reference100</property>
+            <layout>
+              <property name="left_attach">10</property>
+              <property name="top_attach">0</property>
+              <property name="column-span">1</property>
+              <property name="row-span">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">10</property>
-            <property name="top_attach">0</property>
-            <property name="width">1</property>
-            <property name="height">1</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="label110">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="ellipsize">end</property>
             <property name="label" translatable="yes">XXX</property>
             <property name="name">reference110</property>
+            <layout>
+              <property name="left_attach">11</property>
+              <property name="top_attach">0</property>
+              <property name="column-span">1</property>
+              <property name="row-span">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">11</property>
-            <property name="top_attach">0</property>
-            <property name="width">1</property>
-            <property name="height">1</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="label120">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="ellipsize">end</property>
             <property name="label" translatable="yes">XXX</property>
             <property name="name">reference120</property>
+            <layout>
+              <property name="left_attach">12</property>
+              <property name="top_attach">0</property>
+              <property name="column-span">1</property>
+              <property name="row-span">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">12</property>
-            <property name="top_attach">0</property>
-            <property name="width">1</property>
-            <property name="height">1</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="label130">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="ellipsize">end</property>
             <property name="label" translatable="yes">XXX</property>
             <property name="name">reference130</property>
+            <layout>
+              <property name="left_attach">13</property>
+              <property name="top_attach">0</property>
+              <property name="column-span">1</property>
+              <property name="row-span">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">13</property>
-            <property name="top_attach">0</property>
-            <property name="width">1</property>
-            <property name="height">1</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="label140">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="ellipsize">end</property>
             <property name="label" translatable="yes">XXX</property>
             <property name="name">reference140</property>
+            <layout>
+              <property name="left_attach">14</property>
+              <property name="top_attach">0</property>
+              <property name="column-span">1</property>
+              <property name="row-span">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">14</property>
-            <property name="top_attach">0</property>
-            <property name="width">1</property>
-            <property name="height">1</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="label1">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="ellipsize">end</property>
             <property name="label" translatable="yes">XXX</property>
             <property name="name">reference1</property>
+            <layout>
+              <property name="left_attach">0</property>
+              <property name="top_attach">1</property>
+              <property name="column-span">1</property>
+              <property name="row-span">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">0</property>
-            <property name="top_attach">1</property>
-            <property name="width">1</property>
-            <property name="height">1</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="label11">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="ellipsize">end</property>
             <property name="label" translatable="yes">XXX</property>
             <property name="name">reference11</property>
+            <layout>
+              <property name="left_attach">1</property>
+              <property name="top_attach">1</property>
+              <property name="column-span">1</property>
+              <property name="row-span">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">1</property>
-            <property name="top_attach">1</property>
-            <property name="width">1</property>
-            <property name="height">1</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="label21">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="ellipsize">end</property>
             <property name="label" translatable="yes">XXX</property>
             <property name="name">reference21</property>
+            <layout>
+              <property name="left_attach">2</property>
+              <property name="top_attach">1</property>
+              <property name="column-span">1</property>
+              <property name="row-span">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">2</property>
-            <property name="top_attach">1</property>
-            <property name="width">1</property>
-            <property name="height">1</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="label31">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="ellipsize">end</property>
             <property name="label" translatable="yes">XXX</property>
             <property name="name">reference31</property>
+            <layout>
+              <property name="left_attach">3</property>
+              <property name="top_attach">1</property>
+              <property name="column-span">1</property>
+              <property name="row-span">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">3</property>
-            <property name="top_attach">1</property>
-            <property name="width">1</property>
-            <property name="height">1</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="label41">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="ellipsize">end</property>
             <property name="label" translatable="yes">XXX</property>
             <property name="name">reference41</property>
+            <layout>
+              <property name="left_attach">4</property>
+              <property name="top_attach">1</property>
+              <property name="column-span">1</property>
+              <property name="row-span">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">4</property>
-            <property name="top_attach">1</property>
-            <property name="width">1</property>
-            <property name="height">1</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="label51">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="ellipsize">end</property>
             <property name="label" translatable="yes">XXX</property>
             <property name="name">reference51</property>
+            <layout>
+              <property name="left_attach">5</property>
+              <property name="top_attach">1</property>
+              <property name="column-span">1</property>
+              <property name="row-span">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">5</property>
-            <property name="top_attach">1</property>
-            <property name="width">1</property>
-            <property name="height">1</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="label61">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="ellipsize">end</property>
             <property name="label" translatable="yes">XXX</property>
             <property name="name">reference61</property>
+            <layout>
+              <property name="left_attach">6</property>
+              <property name="top_attach">1</property>
+              <property name="column-span">1</property>
+              <property name="row-span">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">6</property>
-            <property name="top_attach">1</property>
-            <property name="width">1</property>
-            <property name="height">1</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="label71">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="ellipsize">end</property>
             <property name="label" translatable="yes">XXX</property>
             <property name="name">reference71</property>
+            <layout>
+              <property name="left_attach">7</property>
+              <property name="top_attach">1</property>
+              <property name="column-span">1</property>
+              <property name="row-span">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">7</property>
-            <property name="top_attach">1</property>
-            <property name="width">1</property>
-            <property name="height">1</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="label81">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="ellipsize">end</property>
             <property name="label" translatable="yes">XXX</property>
             <property name="name">reference81</property>
+            <layout>
+              <property name="left_attach">8</property>
+              <property name="top_attach">1</property>
+              <property name="column-span">1</property>
+              <property name="row-span">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">8</property>
-            <property name="top_attach">1</property>
-            <property name="width">1</property>
-            <property name="height">1</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="label91">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="ellipsize">end</property>
             <property name="label" translatable="yes">XXX</property>
             <property name="name">reference91</property>
+            <layout>
+              <property name="left_attach">9</property>
+              <property name="top_attach">1</property>
+              <property name="column-span">1</property>
+              <property name="row-span">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">9</property>
-            <property name="top_attach">1</property>
-            <property name="width">1</property>
-            <property name="height">1</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="label101">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="ellipsize">end</property>
             <property name="label" translatable="yes">XXX</property>
             <property name="name">reference101</property>
+            <layout>
+              <property name="left_attach">10</property>
+              <property name="top_attach">1</property>
+              <property name="column-span">1</property>
+              <property name="row-span">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">10</property>
-            <property name="top_attach">1</property>
-            <property name="width">1</property>
-            <property name="height">1</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="label111">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="ellipsize">end</property>
             <property name="label" translatable="yes">XXX</property>
             <property name="name">reference111</property>
+            <layout>
+              <property name="left_attach">11</property>
+              <property name="top_attach">1</property>
+              <property name="column-span">1</property>
+              <property name="row-span">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">11</property>
-            <property name="top_attach">1</property>
-            <property name="width">1</property>
-            <property name="height">1</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="label121">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="ellipsize">end</property>
             <property name="label" translatable="yes">XXX</property>
             <property name="name">reference121</property>
+            <layout>
+              <property name="left_attach">12</property>
+              <property name="top_attach">1</property>
+              <property name="column-span">1</property>
+              <property name="row-span">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">12</property>
-            <property name="top_attach">1</property>
-            <property name="width">1</property>
-            <property name="height">1</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="label131">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="ellipsize">end</property>
             <property name="label" translatable="yes">XXX</property>
             <property name="name">reference131</property>
+            <layout>
+              <property name="left_attach">13</property>
+              <property name="top_attach">1</property>
+              <property name="column-span">1</property>
+              <property name="row-span">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">13</property>
-            <property name="top_attach">1</property>
-            <property name="width">1</property>
-            <property name="height">1</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="label141">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="ellipsize">end</property>
             <property name="label" translatable="yes">XXX</property>
             <property name="name">reference141</property>
+            <layout>
+              <property name="left_attach">14</property>
+              <property name="top_attach">1</property>
+              <property name="column-span">1</property>
+              <property name="row-span">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">14</property>
-            <property name="top_attach">1</property>
-            <property name="width">1</property>
-            <property name="height">1</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="label2">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="ellipsize">end</property>
             <property name="label" translatable="yes">XXX</property>
             <property name="name">reference2</property>
+            <layout>
+              <property name="left_attach">0</property>
+              <property name="top_attach">2</property>
+              <property name="column-span">1</property>
+              <property name="row-span">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">0</property>
-            <property name="top_attach">2</property>
-            <property name="width">1</property>
-            <property name="height">1</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="label12">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="ellipsize">end</property>
             <property name="label" translatable="yes">XXX</property>
             <property name="name">reference12</property>
+            <layout>
+              <property name="left_attach">1</property>
+              <property name="top_attach">2</property>
+              <property name="column-span">1</property>
+              <property name="row-span">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">1</property>
-            <property name="top_attach">2</property>
-            <property name="width">1</property>
-            <property name="height">1</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="label22">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="ellipsize">end</property>
             <property name="label" translatable="yes">XXX</property>
             <property name="name">reference22</property>
+            <layout>
+              <property name="left_attach">2</property>
+              <property name="top_attach">2</property>
+              <property name="column-span">1</property>
+              <property name="row-span">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">2</property>
-            <property name="top_attach">2</property>
-            <property name="width">1</property>
-            <property name="height">1</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="label32">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="ellipsize">end</property>
             <property name="label" translatable="yes">XXX</property>
             <property name="name">reference32</property>
+            <layout>
+              <property name="left_attach">3</property>
+              <property name="top_attach">2</property>
+              <property name="column-span">1</property>
+              <property name="row-span">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">3</property>
-            <property name="top_attach">2</property>
-            <property name="width">1</property>
-            <property name="height">1</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="label42">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="ellipsize">end</property>
             <property name="label" translatable="yes">XXX</property>
             <property name="name">reference42</property>
+            <layout>
+              <property name="left_attach">4</property>
+              <property name="top_attach">2</property>
+              <property name="column-span">1</property>
+              <property name="row-span">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">4</property>
-            <property name="top_attach">2</property>
-            <property name="width">1</property>
-            <property name="height">1</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="label52">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="ellipsize">end</property>
             <property name="label" translatable="yes">XXX</property>
             <property name="name">reference52</property>
+            <layout>
+              <property name="left_attach">5</property>
+              <property name="top_attach">2</property>
+              <property name="column-span">1</property>
+              <property name="row-span">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">5</property>
-            <property name="top_attach">2</property>
-            <property name="width">1</property>
-            <property name="height">1</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="label62">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="ellipsize">end</property>
             <property name="label" translatable="yes">XXX</property>
             <property name="name">reference62</property>
+            <layout>
+              <property name="left_attach">6</property>
+              <property name="top_attach">2</property>
+              <property name="column-span">1</property>
+              <property name="row-span">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">6</property>
-            <property name="top_attach">2</property>
-            <property name="width">1</property>
-            <property name="height">1</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="label72">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="ellipsize">end</property>
             <property name="label" translatable="yes">XXX</property>
             <property name="name">reference72</property>
+            <layout>
+              <property name="left_attach">7</property>
+              <property name="top_attach">2</property>
+              <property name="column-span">1</property>
+              <property name="row-span">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">7</property>
-            <property name="top_attach">2</property>
-            <property name="width">1</property>
-            <property name="height">1</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="label82">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="ellipsize">end</property>
             <property name="label" translatable="yes">XXX</property>
             <property name="name">reference82</property>
+            <layout>
+              <property name="left_attach">8</property>
+              <property name="top_attach">2</property>
+              <property name="column-span">1</property>
+              <property name="row-span">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">8</property>
-            <property name="top_attach">2</property>
-            <property name="width">1</property>
-            <property name="height">1</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="label92">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="ellipsize">end</property>
             <property name="label" translatable="yes">XXX</property>
             <property name="name">reference92</property>
+            <layout>
+              <property name="left_attach">9</property>
+              <property name="top_attach">2</property>
+              <property name="column-span">1</property>
+              <property name="row-span">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">9</property>
-            <property name="top_attach">2</property>
-            <property name="width">1</property>
-            <property name="height">1</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="label102">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="ellipsize">end</property>
             <property name="label" translatable="yes">XXX</property>
             <property name="name">reference102</property>
+            <layout>
+              <property name="left_attach">10</property>
+              <property name="top_attach">2</property>
+              <property name="column-span">1</property>
+              <property name="row-span">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">10</property>
-            <property name="top_attach">2</property>
-            <property name="width">1</property>
-            <property name="height">1</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="label112">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="ellipsize">end</property>
             <property name="label" translatable="yes">XXX</property>
             <property name="name">reference112</property>
+            <layout>
+              <property name="left_attach">11</property>
+              <property name="top_attach">2</property>
+              <property name="column-span">1</property>
+              <property name="row-span">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">11</property>
-            <property name="top_attach">2</property>
-            <property name="width">1</property>
-            <property name="height">1</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="label122">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="ellipsize">end</property>
             <property name="label" translatable="yes">XXX</property>
             <property name="name">reference122</property>
+            <layout>
+              <property name="left_attach">12</property>
+              <property name="top_attach">2</property>
+              <property name="column-span">1</property>
+              <property name="row-span">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">12</property>
-            <property name="top_attach">2</property>
-            <property name="width">1</property>
-            <property name="height">1</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="label132">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="ellipsize">end</property>
             <property name="label" translatable="yes">XXX</property>
             <property name="name">reference132</property>
+            <layout>
+              <property name="left_attach">13</property>
+              <property name="top_attach">2</property>
+              <property name="column-span">1</property>
+              <property name="row-span">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">13</property>
-            <property name="top_attach">2</property>
-            <property name="width">1</property>
-            <property name="height">1</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="label142">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="ellipsize">end</property>
             <property name="label" translatable="yes">XXX</property>
             <property name="name">reference142</property>
+            <layout>
+              <property name="left_attach">14</property>
+              <property name="top_attach">2</property>
+              <property name="column-span">1</property>
+              <property name="row-span">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">14</property>
-            <property name="top_attach">2</property>
-            <property name="width">1</property>
-            <property name="height">1</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="label3">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="ellipsize">end</property>
             <property name="label" translatable="yes">XXX</property>
             <property name="name">reference3</property>
+            <layout>
+              <property name="left_attach">0</property>
+              <property name="top_attach">3</property>
+              <property name="column-span">1</property>
+              <property name="row-span">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">0</property>
-            <property name="top_attach">3</property>
-            <property name="width">1</property>
-            <property name="height">1</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="label13">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="ellipsize">end</property>
             <property name="label" translatable="yes">XXX</property>
             <property name="name">reference13</property>
+            <layout>
+              <property name="left_attach">1</property>
+              <property name="top_attach">3</property>
+              <property name="column-span">1</property>
+              <property name="row-span">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">1</property>
-            <property name="top_attach">3</property>
-            <property name="width">1</property>
-            <property name="height">1</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="label23">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="ellipsize">end</property>
             <property name="label" translatable="yes">XXX</property>
             <property name="name">reference23</property>
+            <layout>
+              <property name="left_attach">2</property>
+              <property name="top_attach">3</property>
+              <property name="column-span">1</property>
+              <property name="row-span">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">2</property>
-            <property name="top_attach">3</property>
-            <property name="width">1</property>
-            <property name="height">1</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="label33">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="ellipsize">end</property>
             <property name="label" translatable="yes">XXX</property>
             <property name="name">reference33</property>
+            <layout>
+              <property name="left_attach">3</property>
+              <property name="top_attach">3</property>
+              <property name="column-span">1</property>
+              <property name="row-span">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">3</property>
-            <property name="top_attach">3</property>
-            <property name="width">1</property>
-            <property name="height">1</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="label43">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="ellipsize">end</property>
             <property name="label" translatable="yes">XXX</property>
             <property name="name">reference43</property>
+            <layout>
+              <property name="left_attach">4</property>
+              <property name="top_attach">3</property>
+              <property name="column-span">1</property>
+              <property name="row-span">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">4</property>
-            <property name="top_attach">3</property>
-            <property name="width">1</property>
-            <property name="height">1</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="label53">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="ellipsize">end</property>
             <property name="label" translatable="yes">XXX</property>
             <property name="name">reference53</property>
+            <layout>
+              <property name="left_attach">5</property>
+              <property name="top_attach">3</property>
+              <property name="column-span">1</property>
+              <property name="row-span">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">5</property>
-            <property name="top_attach">3</property>
-            <property name="width">1</property>
-            <property name="height">1</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="label63">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="ellipsize">end</property>
             <property name="label" translatable="yes">XXX</property>
             <property name="name">reference63</property>
+            <layout>
+              <property name="left_attach">6</property>
+              <property name="top_attach">3</property>
+              <property name="column-span">1</property>
+              <property name="row-span">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">6</property>
-            <property name="top_attach">3</property>
-            <property name="width">1</property>
-            <property name="height">1</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="label73">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="ellipsize">end</property>
             <property name="label" translatable="yes">XXX</property>
             <property name="name">reference73</property>
+            <layout>
+              <property name="left_attach">7</property>
+              <property name="top_attach">3</property>
+              <property name="column-span">1</property>
+              <property name="row-span">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">7</property>
-            <property name="top_attach">3</property>
-            <property name="width">1</property>
-            <property name="height">1</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="label83">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="ellipsize">end</property>
             <property name="label" translatable="yes">XXX</property>
             <property name="name">reference83</property>
+            <layout>
+              <property name="left_attach">8</property>
+              <property name="top_attach">3</property>
+              <property name="column-span">1</property>
+              <property name="row-span">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">8</property>
-            <property name="top_attach">3</property>
-            <property name="width">1</property>
-            <property name="height">1</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="label93">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="ellipsize">end</property>
             <property name="label" translatable="yes">XXX</property>
             <property name="name">reference93</property>
+            <layout>
+              <property name="left_attach">9</property>
+              <property name="top_attach">3</property>
+              <property name="column-span">1</property>
+              <property name="row-span">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">9</property>
-            <property name="top_attach">3</property>
-            <property name="width">1</property>
-            <property name="height">1</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="label103">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="ellipsize">end</property>
             <property name="label" translatable="yes">XXX</property>
             <property name="name">reference103</property>
+            <layout>
+              <property name="left_attach">10</property>
+              <property name="top_attach">3</property>
+              <property name="column-span">1</property>
+              <property name="row-span">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">10</property>
-            <property name="top_attach">3</property>
-            <property name="width">1</property>
-            <property name="height">1</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="label113">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="ellipsize">end</property>
             <property name="label" translatable="yes">XXX</property>
             <property name="name">reference113</property>
+            <layout>
+              <property name="left_attach">11</property>
+              <property name="top_attach">3</property>
+              <property name="column-span">1</property>
+              <property name="row-span">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">11</property>
-            <property name="top_attach">3</property>
-            <property name="width">1</property>
-            <property name="height">1</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="label123">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="ellipsize">end</property>
             <property name="label" translatable="yes">XXX</property>
             <property name="name">reference123</property>
+            <layout>
+              <property name="left_attach">12</property>
+              <property name="top_attach">3</property>
+              <property name="column-span">1</property>
+              <property name="row-span">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">12</property>
-            <property name="top_attach">3</property>
-            <property name="width">1</property>
-            <property name="height">1</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="label133">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="ellipsize">end</property>
             <property name="label" translatable="yes">XXX</property>
             <property name="name">reference133</property>
+            <layout>
+              <property name="left_attach">13</property>
+              <property name="top_attach">3</property>
+              <property name="column-span">1</property>
+              <property name="row-span">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">13</property>
-            <property name="top_attach">3</property>
-            <property name="width">1</property>
-            <property name="height">1</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="label143">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="ellipsize">end</property>
             <property name="label" translatable="yes">XXX</property>
             <property name="name">reference143</property>
+            <layout>
+              <property name="left_attach">14</property>
+              <property name="top_attach">3</property>
+              <property name="column-span">1</property>
+              <property name="row-span">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">14</property>
-            <property name="top_attach">3</property>
-            <property name="width">1</property>
-            <property name="height">1</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="label4">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="ellipsize">end</property>
             <property name="label" translatable="yes">XXX</property>
             <property name="name">reference4</property>
+            <layout>
+              <property name="left_attach">0</property>
+              <property name="top_attach">4</property>
+              <property name="column-span">1</property>
+              <property name="row-span">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">0</property>
-            <property name="top_attach">4</property>
-            <property name="width">1</property>
-            <property name="height">1</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="label14">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="ellipsize">end</property>
             <property name="label" translatable="yes">XXX</property>
             <property name="name">reference14</property>
+            <layout>
+              <property name="left_attach">1</property>
+              <property name="top_attach">4</property>
+              <property name="column-span">1</property>
+              <property name="row-span">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">1</property>
-            <property name="top_attach">4</property>
-            <property name="width">1</property>
-            <property name="height">1</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="label24">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="ellipsize">end</property>
             <property name="label" translatable="yes">XXX</property>
             <property name="name">reference24</property>
+            <layout>
+              <property name="left_attach">2</property>
+              <property name="top_attach">4</property>
+              <property name="column-span">1</property>
+              <property name="row-span">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">2</property>
-            <property name="top_attach">4</property>
-            <property name="width">1</property>
-            <property name="height">1</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="label34">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="ellipsize">end</property>
             <property name="label" translatable="yes">XXX</property>
             <property name="name">reference34</property>
+            <layout>
+              <property name="left_attach">3</property>
+              <property name="top_attach">4</property>
+              <property name="column-span">1</property>
+              <property name="row-span">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">3</property>
-            <property name="top_attach">4</property>
-            <property name="width">1</property>
-            <property name="height">1</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="label44">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="ellipsize">end</property>
             <property name="label" translatable="yes">XXX</property>
             <property name="name">reference44</property>
+            <layout>
+              <property name="left_attach">4</property>
+              <property name="top_attach">4</property>
+              <property name="column-span">1</property>
+              <property name="row-span">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">4</property>
-            <property name="top_attach">4</property>
-            <property name="width">1</property>
-            <property name="height">1</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="label54">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="ellipsize">end</property>
             <property name="label" translatable="yes">XXX</property>
             <property name="name">reference54</property>
+            <layout>
+              <property name="left_attach">5</property>
+              <property name="top_attach">4</property>
+              <property name="column-span">1</property>
+              <property name="row-span">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">5</property>
-            <property name="top_attach">4</property>
-            <property name="width">1</property>
-            <property name="height">1</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="label64">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="ellipsize">end</property>
             <property name="label" translatable="yes">XXX</property>
             <property name="name">reference64</property>
+            <layout>
+              <property name="left_attach">6</property>
+              <property name="top_attach">4</property>
+              <property name="column-span">1</property>
+              <property name="row-span">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">6</property>
-            <property name="top_attach">4</property>
-            <property name="width">1</property>
-            <property name="height">1</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="label74">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="ellipsize">end</property>
             <property name="label" translatable="yes">XXX</property>
             <property name="name">reference74</property>
+            <layout>
+              <property name="left_attach">7</property>
+              <property name="top_attach">4</property>
+              <property name="column-span">1</property>
+              <property name="row-span">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">7</property>
-            <property name="top_attach">4</property>
-            <property name="width">1</property>
-            <property name="height">1</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="label84">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="ellipsize">end</property>
             <property name="label" translatable="yes">XXX</property>
             <property name="name">reference84</property>
+            <layout>
+              <property name="left_attach">8</property>
+              <property name="top_attach">4</property>
+              <property name="column-span">1</property>
+              <property name="row-span">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">8</property>
-            <property name="top_attach">4</property>
-            <property name="width">1</property>
-            <property name="height">1</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="label94">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="ellipsize">end</property>
             <property name="label" translatable="yes">XXX</property>
             <property name="name">reference94</property>
+            <layout>
+              <property name="left_attach">9</property>
+              <property name="top_attach">4</property>
+              <property name="column-span">1</property>
+              <property name="row-span">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">9</property>
-            <property name="top_attach">4</property>
-            <property name="width">1</property>
-            <property name="height">1</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="label104">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="ellipsize">end</property>
             <property name="label" translatable="yes">XXX</property>
             <property name="name">reference104</property>
+            <layout>
+              <property name="left_attach">10</property>
+              <property name="top_attach">4</property>
+              <property name="column-span">1</property>
+              <property name="row-span">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">10</property>
-            <property name="top_attach">4</property>
-            <property name="width">1</property>
-            <property name="height">1</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="label114">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="ellipsize">end</property>
             <property name="label" translatable="yes">XXX</property>
             <property name="name">reference114</property>
+            <layout>
+              <property name="left_attach">11</property>
+              <property name="top_attach">4</property>
+              <property name="column-span">1</property>
+              <property name="row-span">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">11</property>
-            <property name="top_attach">4</property>
-            <property name="width">1</property>
-            <property name="height">1</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="label124">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="ellipsize">end</property>
             <property name="label" translatable="yes">XXX</property>
             <property name="name">reference124</property>
+            <layout>
+              <property name="left_attach">12</property>
+              <property name="top_attach">4</property>
+              <property name="column-span">1</property>
+              <property name="row-span">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">12</property>
-            <property name="top_attach">4</property>
-            <property name="width">1</property>
-            <property name="height">1</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="label134">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="ellipsize">end</property>
             <property name="label" translatable="yes">XXX</property>
             <property name="name">reference134</property>
+            <layout>
+              <property name="left_attach">13</property>
+              <property name="top_attach">4</property>
+              <property name="column-span">1</property>
+              <property name="row-span">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">13</property>
-            <property name="top_attach">4</property>
-            <property name="width">1</property>
-            <property name="height">1</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="label144">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="ellipsize">end</property>
             <property name="label" translatable="yes">XXX</property>
             <property name="name">reference144</property>
+            <layout>
+              <property name="left_attach">14</property>
+              <property name="top_attach">4</property>
+              <property name="column-span">1</property>
+              <property name="row-span">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">14</property>
-            <property name="top_attach">4</property>
-            <property name="width">1</property>
-            <property name="height">1</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="label5">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="ellipsize">end</property>
             <property name="label" translatable="yes">XXX</property>
             <property name="name">reference5</property>
+            <layout>
+              <property name="left_attach">0</property>
+              <property name="top_attach">5</property>
+              <property name="column-span">1</property>
+              <property name="row-span">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">0</property>
-            <property name="top_attach">5</property>
-            <property name="width">1</property>
-            <property name="height">1</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="label15">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="ellipsize">end</property>
             <property name="label" translatable="yes">XXX</property>
             <property name="name">reference15</property>
+            <layout>
+              <property name="left_attach">1</property>
+              <property name="top_attach">5</property>
+              <property name="column-span">1</property>
+              <property name="row-span">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">1</property>
-            <property name="top_attach">5</property>
-            <property name="width">1</property>
-            <property name="height">1</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="label25">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="ellipsize">end</property>
             <property name="label" translatable="yes">XXX</property>
             <property name="name">reference25</property>
+            <layout>
+              <property name="left_attach">2</property>
+              <property name="top_attach">5</property>
+              <property name="column-span">1</property>
+              <property name="row-span">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">2</property>
-            <property name="top_attach">5</property>
-            <property name="width">1</property>
-            <property name="height">1</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="label35">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="ellipsize">end</property>
             <property name="label" translatable="yes">XXX</property>
             <property name="name">reference35</property>
+            <layout>
+              <property name="left_attach">3</property>
+              <property name="top_attach">5</property>
+              <property name="column-span">1</property>
+              <property name="row-span">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">3</property>
-            <property name="top_attach">5</property>
-            <property name="width">1</property>
-            <property name="height">1</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="label45">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="ellipsize">end</property>
             <property name="label" translatable="yes">XXX</property>
             <property name="name">reference45</property>
+            <layout>
+              <property name="left_attach">4</property>
+              <property name="top_attach">5</property>
+              <property name="column-span">1</property>
+              <property name="row-span">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">4</property>
-            <property name="top_attach">5</property>
-            <property name="width">1</property>
-            <property name="height">1</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="label55">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="ellipsize">end</property>
             <property name="label" translatable="yes">XXX</property>
             <property name="name">reference55</property>
+            <layout>
+              <property name="left_attach">5</property>
+              <property name="top_attach">5</property>
+              <property name="column-span">1</property>
+              <property name="row-span">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">5</property>
-            <property name="top_attach">5</property>
-            <property name="width">1</property>
-            <property name="height">1</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="label65">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="ellipsize">end</property>
             <property name="label" translatable="yes">XXX</property>
             <property name="name">reference65</property>
+            <layout>
+              <property name="left_attach">6</property>
+              <property name="top_attach">5</property>
+              <property name="column-span">1</property>
+              <property name="row-span">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">6</property>
-            <property name="top_attach">5</property>
-            <property name="width">1</property>
-            <property name="height">1</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="label75">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="ellipsize">end</property>
             <property name="label" translatable="yes">XXX</property>
             <property name="name">reference75</property>
+            <layout>
+              <property name="left_attach">7</property>
+              <property name="top_attach">5</property>
+              <property name="column-span">1</property>
+              <property name="row-span">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">7</property>
-            <property name="top_attach">5</property>
-            <property name="width">1</property>
-            <property name="height">1</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="label85">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="ellipsize">end</property>
             <property name="label" translatable="yes">XXX</property>
             <property name="name">reference85</property>
+            <layout>
+              <property name="left_attach">8</property>
+              <property name="top_attach">5</property>
+              <property name="column-span">1</property>
+              <property name="row-span">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">8</property>
-            <property name="top_attach">5</property>
-            <property name="width">1</property>
-            <property name="height">1</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="label95">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="ellipsize">end</property>
             <property name="label" translatable="yes">XXX</property>
             <property name="name">reference95</property>
+            <layout>
+              <property name="left_attach">9</property>
+              <property name="top_attach">5</property>
+              <property name="column-span">1</property>
+              <property name="row-span">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">9</property>
-            <property name="top_attach">5</property>
-            <property name="width">1</property>
-            <property name="height">1</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="label105">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="ellipsize">end</property>
             <property name="label" translatable="yes">XXX</property>
             <property name="name">reference105</property>
+            <layout>
+              <property name="left_attach">10</property>
+              <property name="top_attach">5</property>
+              <property name="column-span">1</property>
+              <property name="row-span">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">10</property>
-            <property name="top_attach">5</property>
-            <property name="width">1</property>
-            <property name="height">1</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="label115">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="ellipsize">end</property>
             <property name="label" translatable="yes">XXX</property>
             <property name="name">reference115</property>
+            <layout>
+              <property name="left_attach">11</property>
+              <property name="top_attach">5</property>
+              <property name="column-span">1</property>
+              <property name="row-span">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">11</property>
-            <property name="top_attach">5</property>
-            <property name="width">1</property>
-            <property name="height">1</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="label125">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="ellipsize">end</property>
             <property name="label" translatable="yes">XXX</property>
             <property name="name">reference125</property>
+            <layout>
+              <property name="left_attach">12</property>
+              <property name="top_attach">5</property>
+              <property name="column-span">1</property>
+              <property name="row-span">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">12</property>
-            <property name="top_attach">5</property>
-            <property name="width">1</property>
-            <property name="height">1</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="label135">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="ellipsize">end</property>
             <property name="label" translatable="yes">XXX</property>
             <property name="name">reference135</property>
+            <layout>
+              <property name="left_attach">13</property>
+              <property name="top_attach">5</property>
+              <property name="column-span">1</property>
+              <property name="row-span">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">13</property>
-            <property name="top_attach">5</property>
-            <property name="width">1</property>
-            <property name="height">1</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="label145">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="ellipsize">end</property>
             <property name="label" translatable="yes">XXX</property>
             <property name="name">reference145</property>
+            <layout>
+              <property name="left_attach">14</property>
+              <property name="top_attach">5</property>
+              <property name="column-span">1</property>
+              <property name="row-span">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">14</property>
-            <property name="top_attach">5</property>
-            <property name="width">1</property>
-            <property name="height">1</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="label6">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="ellipsize">end</property>
             <property name="label" translatable="yes">XXX</property>
             <property name="name">reference6</property>
+            <layout>
+              <property name="left_attach">0</property>
+              <property name="top_attach">6</property>
+              <property name="column-span">1</property>
+              <property name="row-span">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">0</property>
-            <property name="top_attach">6</property>
-            <property name="width">1</property>
-            <property name="height">1</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="label16">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="ellipsize">end</property>
             <property name="label" translatable="yes">XXX</property>
             <property name="name">reference16</property>
+            <layout>
+              <property name="left_attach">1</property>
+              <property name="top_attach">6</property>
+              <property name="column-span">1</property>
+              <property name="row-span">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">1</property>
-            <property name="top_attach">6</property>
-            <property name="width">1</property>
-            <property name="height">1</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="label26">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="ellipsize">end</property>
             <property name="label" translatable="yes">XXX</property>
             <property name="name">reference26</property>
+            <layout>
+              <property name="left_attach">2</property>
+              <property name="top_attach">6</property>
+              <property name="column-span">1</property>
+              <property name="row-span">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">2</property>
-            <property name="top_attach">6</property>
-            <property name="width">1</property>
-            <property name="height">1</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="label36">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="ellipsize">end</property>
             <property name="label" translatable="yes">XXX</property>
             <property name="name">reference36</property>
+            <layout>
+              <property name="left_attach">3</property>
+              <property name="top_attach">6</property>
+              <property name="column-span">1</property>
+              <property name="row-span">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">3</property>
-            <property name="top_attach">6</property>
-            <property name="width">1</property>
-            <property name="height">1</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="label46">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="ellipsize">end</property>
             <property name="label" translatable="yes">XXX</property>
             <property name="name">reference46</property>
+            <layout>
+              <property name="left_attach">4</property>
+              <property name="top_attach">6</property>
+              <property name="column-span">1</property>
+              <property name="row-span">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">4</property>
-            <property name="top_attach">6</property>
-            <property name="width">1</property>
-            <property name="height">1</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="label56">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="ellipsize">end</property>
             <property name="label" translatable="yes">XXX</property>
             <property name="name">reference56</property>
+            <layout>
+              <property name="left_attach">5</property>
+              <property name="top_attach">6</property>
+              <property name="column-span">1</property>
+              <property name="row-span">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">5</property>
-            <property name="top_attach">6</property>
-            <property name="width">1</property>
-            <property name="height">1</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="label66">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="ellipsize">end</property>
             <property name="label" translatable="yes">XXX</property>
             <property name="name">reference66</property>
+            <layout>
+              <property name="left_attach">6</property>
+              <property name="top_attach">6</property>
+              <property name="column-span">1</property>
+              <property name="row-span">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">6</property>
-            <property name="top_attach">6</property>
-            <property name="width">1</property>
-            <property name="height">1</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="label76">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="ellipsize">end</property>
             <property name="label" translatable="yes">XXX</property>
             <property name="name">reference76</property>
+            <layout>
+              <property name="left_attach">7</property>
+              <property name="top_attach">6</property>
+              <property name="column-span">1</property>
+              <property name="row-span">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">7</property>
-            <property name="top_attach">6</property>
-            <property name="width">1</property>
-            <property name="height">1</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="label86">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="ellipsize">end</property>
             <property name="label" translatable="yes">XXX</property>
             <property name="name">reference86</property>
+            <layout>
+              <property name="left_attach">8</property>
+              <property name="top_attach">6</property>
+              <property name="column-span">1</property>
+              <property name="row-span">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">8</property>
-            <property name="top_attach">6</property>
-            <property name="width">1</property>
-            <property name="height">1</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="label96">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="ellipsize">end</property>
             <property name="label" translatable="yes">XXX</property>
             <property name="name">reference96</property>
+            <layout>
+              <property name="left_attach">9</property>
+              <property name="top_attach">6</property>
+              <property name="column-span">1</property>
+              <property name="row-span">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">9</property>
-            <property name="top_attach">6</property>
-            <property name="width">1</property>
-            <property name="height">1</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="label106">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="ellipsize">end</property>
             <property name="label" translatable="yes">XXX</property>
             <property name="name">reference106</property>
+            <layout>
+              <property name="left_attach">10</property>
+              <property name="top_attach">6</property>
+              <property name="column-span">1</property>
+              <property name="row-span">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">10</property>
-            <property name="top_attach">6</property>
-            <property name="width">1</property>
-            <property name="height">1</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="label116">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="ellipsize">end</property>
             <property name="label" translatable="yes">XXX</property>
             <property name="name">reference116</property>
+            <layout>
+              <property name="left_attach">11</property>
+              <property name="top_attach">6</property>
+              <property name="column-span">1</property>
+              <property name="row-span">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">11</property>
-            <property name="top_attach">6</property>
-            <property name="width">1</property>
-            <property name="height">1</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="label126">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="ellipsize">end</property>
             <property name="label" translatable="yes">XXX</property>
             <property name="name">reference126</property>
+            <layout>
+              <property name="left_attach">12</property>
+              <property name="top_attach">6</property>
+              <property name="column-span">1</property>
+              <property name="row-span">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">12</property>
-            <property name="top_attach">6</property>
-            <property name="width">1</property>
-            <property name="height">1</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="label136">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="ellipsize">end</property>
             <property name="label" translatable="yes">XXX</property>
             <property name="name">reference136</property>
+            <layout>
+              <property name="left_attach">13</property>
+              <property name="top_attach">6</property>
+              <property name="column-span">1</property>
+              <property name="row-span">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">13</property>
-            <property name="top_attach">6</property>
-            <property name="width">1</property>
-            <property name="height">1</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="label146">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="ellipsize">end</property>
             <property name="label" translatable="yes">XXX</property>
             <property name="name">reference146</property>
+            <layout>
+              <property name="left_attach">14</property>
+              <property name="top_attach">6</property>
+              <property name="column-span">1</property>
+              <property name="row-span">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">14</property>
-            <property name="top_attach">6</property>
-            <property name="width">1</property>
-            <property name="height">1</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="label7">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="ellipsize">end</property>
             <property name="label" translatable="yes">XXX</property>
             <property name="name">reference7</property>
+            <layout>
+              <property name="left_attach">0</property>
+              <property name="top_attach">7</property>
+              <property name="column-span">1</property>
+              <property name="row-span">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">0</property>
-            <property name="top_attach">7</property>
-            <property name="width">1</property>
-            <property name="height">1</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="label17">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="ellipsize">end</property>
             <property name="label" translatable="yes">XXX</property>
             <property name="name">reference17</property>
+            <layout>
+              <property name="left_attach">1</property>
+              <property name="top_attach">7</property>
+              <property name="column-span">1</property>
+              <property name="row-span">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">1</property>
-            <property name="top_attach">7</property>
-            <property name="width">1</property>
-            <property name="height">1</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="label27">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="ellipsize">end</property>
             <property name="label" translatable="yes">XXX</property>
             <property name="name">reference27</property>
+            <layout>
+              <property name="left_attach">2</property>
+              <property name="top_attach">7</property>
+              <property name="column-span">1</property>
+              <property name="row-span">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">2</property>
-            <property name="top_attach">7</property>
-            <property name="width">1</property>
-            <property name="height">1</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="label37">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="ellipsize">end</property>
             <property name="label" translatable="yes">XXX</property>
             <property name="name">reference37</property>
+            <layout>
+              <property name="left_attach">3</property>
+              <property name="top_attach">7</property>
+              <property name="column-span">1</property>
+              <property name="row-span">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">3</property>
-            <property name="top_attach">7</property>
-            <property name="width">1</property>
-            <property name="height">1</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="label47">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="ellipsize">end</property>
             <property name="label" translatable="yes">XXX</property>
             <property name="name">reference47</property>
+            <layout>
+              <property name="left_attach">4</property>
+              <property name="top_attach">7</property>
+              <property name="column-span">1</property>
+              <property name="row-span">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">4</property>
-            <property name="top_attach">7</property>
-            <property name="width">1</property>
-            <property name="height">1</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="label57">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="ellipsize">end</property>
             <property name="label" translatable="yes">XXX</property>
             <property name="name">reference57</property>
+            <layout>
+              <property name="left_attach">5</property>
+              <property name="top_attach">7</property>
+              <property name="column-span">1</property>
+              <property name="row-span">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">5</property>
-            <property name="top_attach">7</property>
-            <property name="width">1</property>
-            <property name="height">1</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="label67">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="ellipsize">end</property>
             <property name="label" translatable="yes">XXX</property>
             <property name="name">reference67</property>
+            <layout>
+              <property name="left_attach">6</property>
+              <property name="top_attach">7</property>
+              <property name="column-span">1</property>
+              <property name="row-span">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">6</property>
-            <property name="top_attach">7</property>
-            <property name="width">1</property>
-            <property name="height">1</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="label77">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="ellipsize">end</property>
             <property name="label" translatable="yes">XXX</property>
             <property name="name">reference77</property>
+            <layout>
+              <property name="left_attach">7</property>
+              <property name="top_attach">7</property>
+              <property name="column-span">1</property>
+              <property name="row-span">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">7</property>
-            <property name="top_attach">7</property>
-            <property name="width">1</property>
-            <property name="height">1</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="label87">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="ellipsize">end</property>
             <property name="label" translatable="yes">XXX</property>
             <property name="name">reference87</property>
+            <layout>
+              <property name="left_attach">8</property>
+              <property name="top_attach">7</property>
+              <property name="column-span">1</property>
+              <property name="row-span">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">8</property>
-            <property name="top_attach">7</property>
-            <property name="width">1</property>
-            <property name="height">1</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="label97">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="ellipsize">end</property>
             <property name="label" translatable="yes">XXX</property>
             <property name="name">reference97</property>
+            <layout>
+              <property name="left_attach">9</property>
+              <property name="top_attach">7</property>
+              <property name="column-span">1</property>
+              <property name="row-span">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">9</property>
-            <property name="top_attach">7</property>
-            <property name="width">1</property>
-            <property name="height">1</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="label107">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="ellipsize">end</property>
             <property name="label" translatable="yes">XXX</property>
             <property name="name">reference107</property>
+            <layout>
+              <property name="left_attach">10</property>
+              <property name="top_attach">7</property>
+              <property name="column-span">1</property>
+              <property name="row-span">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">10</property>
-            <property name="top_attach">7</property>
-            <property name="width">1</property>
-            <property name="height">1</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="label117">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="ellipsize">end</property>
             <property name="label" translatable="yes">XXX</property>
             <property name="name">reference117</property>
+            <layout>
+              <property name="left_attach">11</property>
+              <property name="top_attach">7</property>
+              <property name="column-span">1</property>
+              <property name="row-span">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">11</property>
-            <property name="top_attach">7</property>
-            <property name="width">1</property>
-            <property name="height">1</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="label127">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="ellipsize">end</property>
             <property name="label" translatable="yes">XXX</property>
             <property name="name">reference127</property>
+            <layout>
+              <property name="left_attach">12</property>
+              <property name="top_attach">7</property>
+              <property name="column-span">1</property>
+              <property name="row-span">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">12</property>
-            <property name="top_attach">7</property>
-            <property name="width">1</property>
-            <property name="height">1</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="label137">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="ellipsize">end</property>
             <property name="label" translatable="yes">XXX</property>
             <property name="name">reference137</property>
+            <layout>
+              <property name="left_attach">13</property>
+              <property name="top_attach">7</property>
+              <property name="column-span">1</property>
+              <property name="row-span">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">13</property>
-            <property name="top_attach">7</property>
-            <property name="width">1</property>
-            <property name="height">1</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="label147">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="ellipsize">end</property>
             <property name="label" translatable="yes">XXX</property>
             <property name="name">reference147</property>
+            <layout>
+              <property name="left_attach">14</property>
+              <property name="top_attach">7</property>
+              <property name="column-span">1</property>
+              <property name="row-span">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">14</property>
-            <property name="top_attach">7</property>
-            <property name="width">1</property>
-            <property name="height">1</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="label8">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="ellipsize">end</property>
             <property name="label" translatable="yes">XXX</property>
             <property name="name">reference8</property>
+            <layout>
+              <property name="left_attach">0</property>
+              <property name="top_attach">8</property>
+              <property name="column-span">1</property>
+              <property name="row-span">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">0</property>
-            <property name="top_attach">8</property>
-            <property name="width">1</property>
-            <property name="height">1</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="label18">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="ellipsize">end</property>
             <property name="label" translatable="yes">XXX</property>
             <property name="name">reference18</property>
+            <layout>
+              <property name="left_attach">1</property>
+              <property name="top_attach">8</property>
+              <property name="column-span">1</property>
+              <property name="row-span">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">1</property>
-            <property name="top_attach">8</property>
-            <property name="width">1</property>
-            <property name="height">1</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="label28">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="ellipsize">end</property>
             <property name="label" translatable="yes">XXX</property>
             <property name="name">reference28</property>
+            <layout>
+              <property name="left_attach">2</property>
+              <property name="top_attach">8</property>
+              <property name="column-span">1</property>
+              <property name="row-span">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">2</property>
-            <property name="top_attach">8</property>
-            <property name="width">1</property>
-            <property name="height">1</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="label38">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="ellipsize">end</property>
             <property name="label" translatable="yes">XXX</property>
             <property name="name">reference38</property>
+            <layout>
+              <property name="left_attach">3</property>
+              <property name="top_attach">8</property>
+              <property name="column-span">1</property>
+              <property name="row-span">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">3</property>
-            <property name="top_attach">8</property>
-            <property name="width">1</property>
-            <property name="height">1</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="label48">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="ellipsize">end</property>
             <property name="label" translatable="yes">XXX</property>
             <property name="name">reference48</property>
+            <layout>
+              <property name="left_attach">4</property>
+              <property name="top_attach">8</property>
+              <property name="column-span">1</property>
+              <property name="row-span">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">4</property>
-            <property name="top_attach">8</property>
-            <property name="width">1</property>
-            <property name="height">1</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="label58">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="ellipsize">end</property>
             <property name="label" translatable="yes">XXX</property>
             <property name="name">reference58</property>
+            <layout>
+              <property name="left_attach">5</property>
+              <property name="top_attach">8</property>
+              <property name="column-span">1</property>
+              <property name="row-span">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">5</property>
-            <property name="top_attach">8</property>
-            <property name="width">1</property>
-            <property name="height">1</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="label68">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="ellipsize">end</property>
             <property name="label" translatable="yes">XXX</property>
             <property name="name">reference68</property>
+            <layout>
+              <property name="left_attach">6</property>
+              <property name="top_attach">8</property>
+              <property name="column-span">1</property>
+              <property name="row-span">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">6</property>
-            <property name="top_attach">8</property>
-            <property name="width">1</property>
-            <property name="height">1</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="label78">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="ellipsize">end</property>
             <property name="label" translatable="yes">XXX</property>
             <property name="name">reference78</property>
+            <layout>
+              <property name="left_attach">7</property>
+              <property name="top_attach">8</property>
+              <property name="column-span">1</property>
+              <property name="row-span">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">7</property>
-            <property name="top_attach">8</property>
-            <property name="width">1</property>
-            <property name="height">1</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="label88">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="ellipsize">end</property>
             <property name="label" translatable="yes">XXX</property>
             <property name="name">reference88</property>
+            <layout>
+              <property name="left_attach">8</property>
+              <property name="top_attach">8</property>
+              <property name="column-span">1</property>
+              <property name="row-span">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">8</property>
-            <property name="top_attach">8</property>
-            <property name="width">1</property>
-            <property name="height">1</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="label98">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="ellipsize">end</property>
             <property name="label" translatable="yes">XXX</property>
             <property name="name">reference98</property>
+            <layout>
+              <property name="left_attach">9</property>
+              <property name="top_attach">8</property>
+              <property name="column-span">1</property>
+              <property name="row-span">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">9</property>
-            <property name="top_attach">8</property>
-            <property name="width">1</property>
-            <property name="height">1</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="label108">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="ellipsize">end</property>
             <property name="label" translatable="yes">XXX</property>
             <property name="name">reference108</property>
+            <layout>
+              <property name="left_attach">10</property>
+              <property name="top_attach">8</property>
+              <property name="column-span">1</property>
+              <property name="row-span">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">10</property>
-            <property name="top_attach">8</property>
-            <property name="width">1</property>
-            <property name="height">1</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="label118">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="ellipsize">end</property>
             <property name="label" translatable="yes">XXX</property>
             <property name="name">reference118</property>
+            <layout>
+              <property name="left_attach">11</property>
+              <property name="top_attach">8</property>
+              <property name="column-span">1</property>
+              <property name="row-span">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">11</property>
-            <property name="top_attach">8</property>
-            <property name="width">1</property>
-            <property name="height">1</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="label128">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="ellipsize">end</property>
             <property name="label" translatable="yes">XXX</property>
             <property name="name">reference128</property>
+            <layout>
+              <property name="left_attach">12</property>
+              <property name="top_attach">8</property>
+              <property name="column-span">1</property>
+              <property name="row-span">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">12</property>
-            <property name="top_attach">8</property>
-            <property name="width">1</property>
-            <property name="height">1</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="label138">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="ellipsize">end</property>
             <property name="label" translatable="yes">XXX</property>
             <property name="name">reference138</property>
+            <layout>
+              <property name="left_attach">13</property>
+              <property name="top_attach">8</property>
+              <property name="column-span">1</property>
+              <property name="row-span">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">13</property>
-            <property name="top_attach">8</property>
-            <property name="width">1</property>
-            <property name="height">1</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="label148">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="ellipsize">end</property>
             <property name="label" translatable="yes">XXX</property>
             <property name="name">reference148</property>
+            <layout>
+              <property name="left_attach">14</property>
+              <property name="top_attach">8</property>
+              <property name="column-span">1</property>
+              <property name="row-span">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">14</property>
-            <property name="top_attach">8</property>
-            <property name="width">1</property>
-            <property name="height">1</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="label9">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="ellipsize">end</property>
             <property name="label" translatable="yes">XXX</property>
             <property name="name">reference9</property>
+            <layout>
+              <property name="left_attach">0</property>
+              <property name="top_attach">9</property>
+              <property name="column-span">1</property>
+              <property name="row-span">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">0</property>
-            <property name="top_attach">9</property>
-            <property name="width">1</property>
-            <property name="height">1</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="label19">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="ellipsize">end</property>
             <property name="label" translatable="yes">XXX</property>
             <property name="name">reference19</property>
+            <layout>
+              <property name="left_attach">1</property>
+              <property name="top_attach">9</property>
+              <property name="column-span">1</property>
+              <property name="row-span">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">1</property>
-            <property name="top_attach">9</property>
-            <property name="width">1</property>
-            <property name="height">1</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="label29">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="ellipsize">end</property>
             <property name="label" translatable="yes">XXX</property>
             <property name="name">reference29</property>
+            <layout>
+              <property name="left_attach">2</property>
+              <property name="top_attach">9</property>
+              <property name="column-span">1</property>
+              <property name="row-span">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">2</property>
-            <property name="top_attach">9</property>
-            <property name="width">1</property>
-            <property name="height">1</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="label39">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="ellipsize">end</property>
             <property name="label" translatable="yes">XXX</property>
             <property name="name">reference39</property>
+            <layout>
+              <property name="left_attach">3</property>
+              <property name="top_attach">9</property>
+              <property name="column-span">1</property>
+              <property name="row-span">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">3</property>
-            <property name="top_attach">9</property>
-            <property name="width">1</property>
-            <property name="height">1</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="label49">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="ellipsize">end</property>
             <property name="label" translatable="yes">XXX</property>
             <property name="name">reference49</property>
+            <layout>
+              <property name="left_attach">4</property>
+              <property name="top_attach">9</property>
+              <property name="column-span">1</property>
+              <property name="row-span">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">4</property>
-            <property name="top_attach">9</property>
-            <property name="width">1</property>
-            <property name="height">1</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="label59">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="ellipsize">end</property>
             <property name="label" translatable="yes">XXX</property>
             <property name="name">reference59</property>
+            <layout>
+              <property name="left_attach">5</property>
+              <property name="top_attach">9</property>
+              <property name="column-span">1</property>
+              <property name="row-span">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">5</property>
-            <property name="top_attach">9</property>
-            <property name="width">1</property>
-            <property name="height">1</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="label69">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="ellipsize">end</property>
             <property name="label" translatable="yes">XXX</property>
             <property name="name">reference69</property>
+            <layout>
+              <property name="left_attach">6</property>
+              <property name="top_attach">9</property>
+              <property name="column-span">1</property>
+              <property name="row-span">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">6</property>
-            <property name="top_attach">9</property>
-            <property name="width">1</property>
-            <property name="height">1</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="label79">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="ellipsize">end</property>
             <property name="label" translatable="yes">XXX</property>
             <property name="name">reference79</property>
+            <layout>
+              <property name="left_attach">7</property>
+              <property name="top_attach">9</property>
+              <property name="column-span">1</property>
+              <property name="row-span">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">7</property>
-            <property name="top_attach">9</property>
-            <property name="width">1</property>
-            <property name="height">1</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="label89">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="ellipsize">end</property>
             <property name="label" translatable="yes">XXX</property>
             <property name="name">reference89</property>
+            <layout>
+              <property name="left_attach">8</property>
+              <property name="top_attach">9</property>
+              <property name="column-span">1</property>
+              <property name="row-span">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">8</property>
-            <property name="top_attach">9</property>
-            <property name="width">1</property>
-            <property name="height">1</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="label99">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="ellipsize">end</property>
             <property name="label" translatable="yes">XXX</property>
             <property name="name">reference99</property>
+            <layout>
+              <property name="left_attach">9</property>
+              <property name="top_attach">9</property>
+              <property name="column-span">1</property>
+              <property name="row-span">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">9</property>
-            <property name="top_attach">9</property>
-            <property name="width">1</property>
-            <property name="height">1</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="label109">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="ellipsize">end</property>
             <property name="label" translatable="yes">XXX</property>
             <property name="name">reference109</property>
+            <layout>
+              <property name="left_attach">10</property>
+              <property name="top_attach">9</property>
+              <property name="column-span">1</property>
+              <property name="row-span">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">10</property>
-            <property name="top_attach">9</property>
-            <property name="width">1</property>
-            <property name="height">1</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="label119">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="ellipsize">end</property>
             <property name="label" translatable="yes">XXX</property>
             <property name="name">reference119</property>
+            <layout>
+              <property name="left_attach">11</property>
+              <property name="top_attach">9</property>
+              <property name="column-span">1</property>
+              <property name="row-span">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">11</property>
-            <property name="top_attach">9</property>
-            <property name="width">1</property>
-            <property name="height">1</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="label129">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="ellipsize">end</property>
             <property name="label" translatable="yes">XXX</property>
             <property name="name">reference129</property>
+            <layout>
+              <property name="left_attach">12</property>
+              <property name="top_attach">9</property>
+              <property name="column-span">1</property>
+              <property name="row-span">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">12</property>
-            <property name="top_attach">9</property>
-            <property name="width">1</property>
-            <property name="height">1</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="label139">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="ellipsize">end</property>
             <property name="label" translatable="yes">XXX</property>
             <property name="name">reference139</property>
+            <layout>
+              <property name="left_attach">13</property>
+              <property name="top_attach">9</property>
+              <property name="column-span">1</property>
+              <property name="row-span">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">13</property>
-            <property name="top_attach">9</property>
-            <property name="width">1</property>
-            <property name="height">1</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="label149">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="ellipsize">end</property>
             <property name="label" translatable="yes">XXX</property>
             <property name="name">reference149</property>
+            <layout>
+              <property name="left_attach">14</property>
+              <property name="top_attach">9</property>
+              <property name="column-span">1</property>
+              <property name="row-span">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">14</property>
-            <property name="top_attach">9</property>
-            <property name="width">1</property>
-            <property name="height">1</property>
-          </packing>
         </child>
       </object>
     </child>

diff --git a/testsuite/reftests/named-colors.ui b/testsuite/reftests/named-colors.ui
index 3468cf72059b4c6a6ea430d1b5dde63c00462acc..ddc39d742ff866646ab1cb83bece927d31de56e2 100644 (file)
--- a/testsuite/reftests/named-colors.ui
+++ b/testsuite/reftests/named-colors.ui
@@ -1,2262 +1,1958 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
-  <!-- interface-requires gtk+ 3.0 -->
   <object class="GtkWindow" id="window1">
-    <property name="can_focus">False</property>
     <property name="type">popup</property>
     <child>
       <object class="GtkGrid" id="grid0">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
         <child>
           <object class="GtkLabel" id="label0">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="ellipsize">end</property>
             <property name="label" translatable="yes">XXX</property>
             <property name="name">color0</property>
+            <layout>
+              <property name="left_attach">0</property>
+              <property name="top_attach">0</property>
+              <property name="column-span">1</property>
+              <property name="row-span">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">0</property>
-            <property name="top_attach">0</property>
-            <property name="width">1</property>
-            <property name="height">1</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="label10">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="ellipsize">end</property>
             <property name="label" translatable="yes">XXX</property>
             <property name="name">color10</property>
+            <layout>
+              <property name="left_attach">1</property>
+              <property name="top_attach">0</property>
+              <property name="column-span">1</property>
+              <property name="row-span">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">1</property>
-            <property name="top_attach">0</property>
-            <property name="width">1</property>
-            <property name="height">1</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="label20">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="ellipsize">end</property>
             <property name="label" translatable="yes">XXX</property>
             <property name="name">color20</property>
+            <layout>
+              <property name="left_attach">2</property>
+              <property name="top_attach">0</property>
+              <property name="column-span">1</property>
+              <property name="row-span">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">2</property>
-            <property name="top_attach">0</property>
-            <property name="width">1</property>
-            <property name="height">1</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="label30">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="ellipsize">end</property>
             <property name="label" translatable="yes">XXX</property>
             <property name="name">color30</property>
+            <layout>
+              <property name="left_attach">3</property>
+              <property name="top_attach">0</property>
+              <property name="column-span">1</property>
+              <property name="row-span">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">3</property>
-            <property name="top_attach">0</property>
-            <property name="width">1</property>
-            <property name="height">1</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="label40">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="ellipsize">end</property>
             <property name="label" translatable="yes">XXX</property>
             <property name="name">color40</property>
+            <layout>
+              <property name="left_attach">4</property>
+              <property name="top_attach">0</property>
+              <property name="column-span">1</property>
+              <property name="row-span">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">4</property>
-            <property name="top_attach">0</property>
-            <property name="width">1</property>
-            <property name="height">1</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="label50">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="ellipsize">end</property>
             <property name="label" translatable="yes">XXX</property>
             <property name="name">color50</property>
+            <layout>
+              <property name="left_attach">5</property>
+              <property name="top_attach">0</property>
+              <property name="column-span">1</property>
+              <property name="row-span">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">5</property>
-            <property name="top_attach">0</property>
-            <property name="width">1</property>
-            <property name="height">1</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="label60">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="ellipsize">end</property>
             <property name="label" translatable="yes">XXX</property>
             <property name="name">color60</property>
+            <layout>
+              <property name="left_attach">6</property>
+              <property name="top_attach">0</property>
+              <property name="column-span">1</property>
+              <property name="row-span">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">6</property>
-            <property name="top_attach">0</property>
-            <property name="width">1</property>
-            <property name="height">1</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="label70">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="ellipsize">end</property>
             <property name="label" translatable="yes">XXX</property>
             <property name="name">color70</property>
+            <layout>
+              <property name="left_attach">7</property>
+              <property name="top_attach">0</property>
+              <property name="column-span">1</property>
+              <property name="row-span">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">7</property>
-            <property name="top_attach">0</property>
-            <property name="width">1</property>
-            <property name="height">1</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="label80">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="ellipsize">end</property>
             <property name="label" translatable="yes">XXX</property>
             <property name="name">color80</property>
+            <layout>
+              <property name="left_attach">8</property>
+              <property name="top_attach">0</property>
+              <property name="column-span">1</property>
+              <property name="row-span">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">8</property>
-            <property name="top_attach">0</property>
-            <property name="width">1</property>
-            <property name="height">1</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="label90">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="ellipsize">end</property>
             <property name="label" translatable="yes">XXX</property>
             <property name="name">color90</property>
+            <layout>
+              <property name="left_attach">9</property>
+              <property name="top_attach">0</property>
+              <property name="column-span">1</property>
+              <property name="row-span">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">9</property>
-            <property name="top_attach">0</property>
-            <property name="width">1</property>
-            <property name="height">1</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="label100">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="ellipsize">end</property>
             <property name="label" translatable="yes">XXX</property>
             <property name="name">color100</property>
+            <layout>
+              <property name="left_attach">10</property>
+              <property name="top_attach">0</property>
+              <property name="column-span">1</property>
+              <property name="row-span">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">10</property>
-            <property name="top_attach">0</property>
-            <property name="width">1</property>
-            <property name="height">1</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="label110">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="ellipsize">end</property>
             <property name="label" translatable="yes">XXX</property>
             <property name="name">color110</property>
+            <layout>
+              <property name="left_attach">11</property>
+              <property name="top_attach">0</property>
+              <property name="column-span">1</property>
+              <property name="row-span">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">11</property>
-            <property name="top_attach">0</property>
-            <property name="width">1</property>
-            <property name="height">1</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="label120">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="ellipsize">end</property>
             <property name="label" translatable="yes">XXX</property>
             <property name="name">color120</property>
+            <layout>
+              <property name="left_attach">12</property>
+              <property name="top_attach">0</property>
+              <property name="column-span">1</property>
+              <property name="row-span">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">12</property>
-            <property name="top_attach">0</property>
-            <property name="width">1</property>
-            <property name="height">1</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="label130">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="ellipsize">end</property>
             <property name="label" translatable="yes">XXX</property>
             <property name="name">color130</property>
+            <layout>
+              <property name="left_attach">13</property>
+              <property name="top_attach">0</property>
+              <property name="column-span">1</property>
+              <property name="row-span">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">13</property>
-            <property name="top_attach">0</property>
-            <property name="width">1</property>
-            <property name="height">1</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="label140">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="ellipsize">end</property>
             <property name="label" translatable="yes">XXX</property>
             <property name="name">color140</property>
+            <layout>
+              <property name="left_attach">14</property>
+              <property name="top_attach">0</property>
+              <property name="column-span">1</property>
+              <property name="row-span">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">14</property>
-            <property name="top_attach">0</property>
-            <property name="width">1</property>
-            <property name="height">1</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="label1">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="ellipsize">end</property>
             <property name="label" translatable="yes">XXX</property>
             <property name="name">color1</property>
+            <layout>
+              <property name="left_attach">0</property>
+              <property name="top_attach">1</property>
+              <property name="column-span">1</property>
+              <property name="row-span">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">0</property>
-            <property name="top_attach">1</property>
-            <property name="width">1</property>
-            <property name="height">1</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="label11">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="ellipsize">end</property>
             <property name="label" translatable="yes">XXX</property>
             <property name="name">color11</property>
+            <layout>
+              <property name="left_attach">1</property>
+              <property name="top_attach">1</property>
+              <property name="column-span">1</property>
+              <property name="row-span">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">1</property>
-            <property name="top_attach">1</property>
-            <property name="width">1</property>
-            <property name="height">1</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="label21">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="ellipsize">end</property>
             <property name="label" translatable="yes">XXX</property>
             <property name="name">color21</property>
+            <layout>
+              <property name="left_attach">2</property>
+              <property name="top_attach">1</property>
+              <property name="column-span">1</property>
+              <property name="row-span">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">2</property>
-            <property name="top_attach">1</property>
-            <property name="width">1</property>
-            <property name="height">1</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="label31">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="ellipsize">end</property>
             <property name="label" translatable="yes">XXX</property>
             <property name="name">color31</property>
+            <layout>
+              <property name="left_attach">3</property>
+              <property name="top_attach">1</property>
+              <property name="column-span">1</property>
+              <property name="row-span">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">3</property>
-            <property name="top_attach">1</property>
-            <property name="width">1</property>
-            <property name="height">1</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="label41">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="ellipsize">end</property>
             <property name="label" translatable="yes">XXX</property>
             <property name="name">color41</property>
+            <layout>
+              <property name="left_attach">4</property>
+              <property name="top_attach">1</property>
+              <property name="column-span">1</property>
+              <property name="row-span">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">4</property>
-            <property name="top_attach">1</property>
-            <property name="width">1</property>
-            <property name="height">1</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="label51">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="ellipsize">end</property>
             <property name="label" translatable="yes">XXX</property>
             <property name="name">color51</property>
+            <layout>
+              <property name="left_attach">5</property>
+              <property name="top_attach">1</property>
+              <property name="column-span">1</property>
+              <property name="row-span">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">5</property>
-            <property name="top_attach">1</property>
-            <property name="width">1</property>
-            <property name="height">1</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="label61">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="ellipsize">end</property>
             <property name="label" translatable="yes">XXX</property>
             <property name="name">color61</property>
+            <layout>
+              <property name="left_attach">6</property>
+              <property name="top_attach">1</property>
+              <property name="column-span">1</property>
+              <property name="row-span">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">6</property>
-            <property name="top_attach">1</property>
-            <property name="width">1</property>
-            <property name="height">1</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="label71">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="ellipsize">end</property>
             <property name="label" translatable="yes">XXX</property>
             <property name="name">color71</property>
+            <layout>
+              <property name="left_attach">7</property>
+              <property name="top_attach">1</property>
+              <property name="column-span">1</property>
+              <property name="row-span">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">7</property>
-            <property name="top_attach">1</property>
-            <property name="width">1</property>
-            <property name="height">1</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="label81">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="ellipsize">end</property>
             <property name="label" translatable="yes">XXX</property>
             <property name="name">color81</property>
+            <layout>
+              <property name="left_attach">8</property>
+              <property name="top_attach">1</property>
+              <property name="column-span">1</property>
+              <property name="row-span">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">8</property>
-            <property name="top_attach">1</property>
-            <property name="width">1</property>
-            <property name="height">1</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="label91">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="ellipsize">end</property>
             <property name="label" translatable="yes">XXX</property>
             <property name="name">color91</property>
+            <layout>
+              <property name="left_attach">9</property>
+              <property name="top_attach">1</property>
+              <property name="column-span">1</property>
+              <property name="row-span">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">9</property>
-            <property name="top_attach">1</property>
-            <property name="width">1</property>
-            <property name="height">1</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="label101">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="ellipsize">end</property>
             <property name="label" translatable="yes">XXX</property>
             <property name="name">color101</property>
+            <layout>
+              <property name="left_attach">10</property>
+              <property name="top_attach">1</property>
+              <property name="column-span">1</property>
+              <property name="row-span">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">10</property>
-            <property name="top_attach">1</property>
-            <property name="width">1</property>
-            <property name="height">1</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="label111">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="ellipsize">end</property>
             <property name="label" translatable="yes">XXX</property>
             <property name="name">color111</property>
+            <layout>
+              <property name="left_attach">11</property>
+              <property name="top_attach">1</property>
+              <property name="column-span">1</property>
+              <property name="row-span">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">11</property>
-            <property name="top_attach">1</property>
-            <property name="width">1</property>
-            <property name="height">1</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="label121">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="ellipsize">end</property>
             <property name="label" translatable="yes">XXX</property>
             <property name="name">color121</property>
+            <layout>
+              <property name="left_attach">12</property>
+              <property name="top_attach">1</property>
+              <property name="column-span">1</property>
+              <property name="row-span">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">12</property>
-            <property name="top_attach">1</property>
-            <property name="width">1</property>
-            <property name="height">1</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="label131">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="ellipsize">end</property>
             <property name="label" translatable="yes">XXX</property>
             <property name="name">color131</property>
+            <layout>
+              <property name="left_attach">13</property>
+              <property name="top_attach">1</property>
+              <property name="column-span">1</property>
+              <property name="row-span">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">13</property>
-            <property name="top_attach">1</property>
-            <property name="width">1</property>
-            <property name="height">1</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="label141">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="ellipsize">end</property>
             <property name="label" translatable="yes">XXX</property>
             <property name="name">color141</property>
+            <layout>
+              <property name="left_attach">14</property>
+              <property name="top_attach">1</property>
+              <property name="column-span">1</property>
+              <property name="row-span">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">14</property>
-            <property name="top_attach">1</property>
-            <property name="width">1</property>
-            <property name="height">1</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="label2">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="ellipsize">end</property>
             <property name="label" translatable="yes">XXX</property>
             <property name="name">color2</property>
+            <layout>
+              <property name="left_attach">0</property>
+              <property name="top_attach">2</property>
+              <property name="column-span">1</property>
+              <property name="row-span">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">0</property>
-            <property name="top_attach">2</property>
-            <property name="width">1</property>
-            <property name="height">1</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="label12">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="ellipsize">end</property>
             <property name="label" translatable="yes">XXX</property>
             <property name="name">color12</property>
+            <layout>
+              <property name="left_attach">1</property>
+              <property name="top_attach">2</property>
+              <property name="column-span">1</property>
+              <property name="row-span">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">1</property>
-            <property name="top_attach">2</property>
-            <property name="width">1</property>
-            <property name="height">1</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="label22">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="ellipsize">end</property>
             <property name="label" translatable="yes">XXX</property>
             <property name="name">color22</property>
+            <layout>
+              <property name="left_attach">2</property>
+              <property name="top_attach">2</property>
+              <property name="column-span">1</property>
+              <property name="row-span">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">2</property>
-            <property name="top_attach">2</property>
-            <property name="width">1</property>
-            <property name="height">1</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="label32">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="ellipsize">end</property>
             <property name="label" translatable="yes">XXX</property>
             <property name="name">color32</property>
+            <layout>
+              <property name="left_attach">3</property>
+              <property name="top_attach">2</property>
+              <property name="column-span">1</property>
+              <property name="row-span">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">3</property>
-            <property name="top_attach">2</property>
-            <property name="width">1</property>
-            <property name="height">1</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="label42">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="ellipsize">end</property>
             <property name="label" translatable="yes">XXX</property>
             <property name="name">color42</property>
+            <layout>
+              <property name="left_attach">4</property>
+              <property name="top_attach">2</property>
+              <property name="column-span">1</property>
+              <property name="row-span">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">4</property>
-            <property name="top_attach">2</property>
-            <property name="width">1</property>
-            <property name="height">1</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="label52">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="ellipsize">end</property>
             <property name="label" translatable="yes">XXX</property>
             <property name="name">color52</property>
+            <layout>
+              <property name="left_attach">5</property>
+              <property name="top_attach">2</property>
+              <property name="column-span">1</property>
+              <property name="row-span">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">5</property>
-            <property name="top_attach">2</property>
-            <property name="width">1</property>
-            <property name="height">1</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="label62">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="ellipsize">end</property>
             <property name="label" translatable="yes">XXX</property>
             <property name="name">color62</property>
+            <layout>
+              <property name="left_attach">6</property>
+              <property name="top_attach">2</property>
+              <property name="column-span">1</property>
+              <property name="row-span">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">6</property>
-            <property name="top_attach">2</property>
-            <property name="width">1</property>
-            <property name="height">1</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="label72">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="ellipsize">end</property>
             <property name="label" translatable="yes">XXX</property>
             <property name="name">color72</property>
+            <layout>
+              <property name="left_attach">7</property>
+              <property name="top_attach">2</property>
+              <property name="column-span">1</property>
+              <property name="row-span">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">7</property>
-            <property name="top_attach">2</property>
-            <property name="width">1</property>
-            <property name="height">1</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="label82">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="ellipsize">end</property>
             <property name="label" translatable="yes">XXX</property>
             <property name="name">color82</property>
+            <layout>
+              <property name="left_attach">8</property>
+              <property name="top_attach">2</property>
+              <property name="column-span">1</property>
+              <property name="row-span">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">8</property>
-            <property name="top_attach">2</property>
-            <property name="width">1</property>
-            <property name="height">1</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="label92">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="ellipsize">end</property>
             <property name="label" translatable="yes">XXX</property>
             <property name="name">color92</property>
+            <layout>
+              <property name="left_attach">9</property>
+              <property name="top_attach">2</property>
+              <property name="column-span">1</property>
+              <property name="row-span">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">9</property>
-            <property name="top_attach">2</property>
-            <property name="width">1</property>
-            <property name="height">1</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="label102">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="ellipsize">end</property>
             <property name="label" translatable="yes">XXX</property>
             <property name="name">color102</property>
+            <layout>
+              <property name="left_attach">10</property>
+              <property name="top_attach">2</property>
+              <property name="column-span">1</property>
+              <property name="row-span">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">10</property>
-            <property name="top_attach">2</property>
-            <property name="width">1</property>
-            <property name="height">1</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="label112">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="ellipsize">end</property>
             <property name="label" translatable="yes">XXX</property>
             <property name="name">color112</property>
+            <layout>
+              <property name="left_attach">11</property>
+              <property name="top_attach">2</property>
+              <property name="column-span">1</property>
+              <property name="row-span">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">11</property>
-            <property name="top_attach">2</property>
-            <property name="width">1</property>
-            <property name="height">1</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="label122">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="ellipsize">end</property>
             <property name="label" translatable="yes">XXX</property>
             <property name="name">color122</property>
+            <layout>
+              <property name="left_attach">12</property>
+              <property name="top_attach">2</property>
+              <property name="column-span">1</property>
+              <property name="row-span">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">12</property>
-            <property name="top_attach">2</property>
-            <property name="width">1</property>
-            <property name="height">1</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="label132">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="ellipsize">end</property>
             <property name="label" translatable="yes">XXX</property>
             <property name="name">color132</property>
+            <layout>
+              <property name="left_attach">13</property>
+              <property name="top_attach">2</property>
+              <property name="column-span">1</property>
+              <property name="row-span">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">13</property>
-            <property name="top_attach">2</property>
-            <property name="width">1</property>
-            <property name="height">1</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="label142">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="ellipsize">end</property>
             <property name="label" translatable="yes">XXX</property>
             <property name="name">color142</property>
+            <layout>
+              <property name="left_attach">14</property>
+              <property name="top_attach">2</property>
+              <property name="column-span">1</property>
+              <property name="row-span">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">14</property>
-            <property name="top_attach">2</property>
-            <property name="width">1</property>
-            <property name="height">1</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="label3">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="ellipsize">end</property>
             <property name="label" translatable="yes">XXX</property>
             <property name="name">color3</property>
+            <layout>
+              <property name="left_attach">0</property>
+              <property name="top_attach">3</property>
+              <property name="column-span">1</property>
+              <property name="row-span">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">0</property>
-            <property name="top_attach">3</property>
-            <property name="width">1</property>
-            <property name="height">1</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="label13">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="ellipsize">end</property>
             <property name="label" translatable="yes">XXX</property>
             <property name="name">color13</property>
+            <layout>
+              <property name="left_attach">1</property>
+              <property name="top_attach">3</property>
+              <property name="column-span">1</property>
+              <property name="row-span">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">1</property>
-            <property name="top_attach">3</property>
-            <property name="width">1</property>
-            <property name="height">1</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="label23">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="ellipsize">end</property>
             <property name="label" translatable="yes">XXX</property>
             <property name="name">color23</property>
+            <layout>
+              <property name="left_attach">2</property>
+              <property name="top_attach">3</property>
+              <property name="column-span">1</property>
+              <property name="row-span">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">2</property>
-            <property name="top_attach">3</property>
-            <property name="width">1</property>
-            <property name="height">1</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="label33">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="ellipsize">end</property>
             <property name="label" translatable="yes">XXX</property>
             <property name="name">color33</property>
+            <layout>
+              <property name="left_attach">3</property>
+              <property name="top_attach">3</property>
+              <property name="column-span">1</property>
+              <property name="row-span">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">3</property>
-            <property name="top_attach">3</property>
-            <property name="width">1</property>
-            <property name="height">1</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="label43">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="ellipsize">end</property>
             <property name="label" translatable="yes">XXX</property>
             <property name="name">color43</property>
+            <layout>
+              <property name="left_attach">4</property>
+              <property name="top_attach">3</property>
+              <property name="column-span">1</property>
+              <property name="row-span">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">4</property>
-            <property name="top_attach">3</property>
-            <property name="width">1</property>
-            <property name="height">1</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="label53">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="ellipsize">end</property>
             <property name="label" translatable="yes">XXX</property>
             <property name="name">color53</property>
+            <layout>
+              <property name="left_attach">5</property>
+              <property name="top_attach">3</property>
+              <property name="column-span">1</property>
+              <property name="row-span">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">5</property>
-            <property name="top_attach">3</property>
-            <property name="width">1</property>
-            <property name="height">1</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="label63">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="ellipsize">end</property>
             <property name="label" translatable="yes">XXX</property>
             <property name="name">color63</property>
+            <layout>
+              <property name="left_attach">6</property>
+              <property name="top_attach">3</property>
+              <property name="column-span">1</property>
+              <property name="row-span">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">6</property>
-            <property name="top_attach">3</property>
-            <property name="width">1</property>
-            <property name="height">1</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="label73">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="ellipsize">end</property>
             <property name="label" translatable="yes">XXX</property>
             <property name="name">color73</property>
+            <layout>
+              <property name="left_attach">7</property>
+              <property name="top_attach">3</property>
+              <property name="column-span">1</property>
+              <property name="row-span">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">7</property>
-            <property name="top_attach">3</property>
-            <property name="width">1</property>
-            <property name="height">1</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="label83">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="ellipsize">end</property>
             <property name="label" translatable="yes">XXX</property>
             <property name="name">color83</property>
+            <layout>
+              <property name="left_attach">8</property>
+              <property name="top_attach">3</property>
+              <property name="column-span">1</property>
+              <property name="row-span">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">8</property>
-            <property name="top_attach">3</property>
-            <property name="width">1</property>
-            <property name="height">1</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="label93">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="ellipsize">end</property>
             <property name="label" translatable="yes">XXX</property>
             <property name="name">color93</property>
+            <layout>
+              <property name="left_attach">9</property>
+              <property name="top_attach">3</property>
+              <property name="column-span">1</property>
+              <property name="row-span">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">9</property>
-            <property name="top_attach">3</property>
-            <property name="width">1</property>
-            <property name="height">1</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="label103">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="ellipsize">end</property>
             <property name="label" translatable="yes">XXX</property>
             <property name="name">color103</property>
+            <layout>
+              <property name="left_attach">10</property>
+              <property name="top_attach">3</property>
+              <property name="column-span">1</property>
+              <property name="row-span">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">10</property>
-            <property name="top_attach">3</property>
-            <property name="width">1</property>
-            <property name="height">1</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="label113">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="ellipsize">end</property>
             <property name="label" translatable="yes">XXX</property>
             <property name="name">color113</property>
+            <layout>
+              <property name="left_attach">11</property>
+              <property name="top_attach">3</property>
+              <property name="column-span">1</property>
+              <property name="row-span">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">11</property>
-            <property name="top_attach">3</property>
-            <property name="width">1</property>
-            <property name="height">1</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="label123">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="ellipsize">end</property>
             <property name="label" translatable="yes">XXX</property>
             <property name="name">color123</property>
+            <layout>
+              <property name="left_attach">12</property>
+              <property name="top_attach">3</property>
+              <property name="column-span">1</property>
+              <property name="row-span">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">12</property>
-            <property name="top_attach">3</property>
-            <property name="width">1</property>
-            <property name="height">1</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="label133">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="ellipsize">end</property>
             <property name="label" translatable="yes">XXX</property>
             <property name="name">color133</property>
+            <layout>
+              <property name="left_attach">13</property>
+              <property name="top_attach">3</property>
+              <property name="column-span">1</property>
+              <property name="row-span">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">13</property>
-            <property name="top_attach">3</property>
-            <property name="width">1</property>
-            <property name="height">1</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="label143">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="ellipsize">end</property>
             <property name="label" translatable="yes">XXX</property>
             <property name="name">color143</property>
+            <layout>
+              <property name="left_attach">14</property>
+              <property name="top_attach">3</property>
+              <property name="column-span">1</property>
+              <property name="row-span">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">14</property>
-            <property name="top_attach">3</property>
-            <property name="width">1</property>
-            <property name="height">1</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="label4">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="ellipsize">end</property>
             <property name="label" translatable="yes">XXX</property>
             <property name="name">color4</property>
+            <layout>
+              <property name="left_attach">0</property>
+              <property name="top_attach">4</property>
+              <property name="column-span">1</property>
+              <property name="row-span">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">0</property>
-            <property name="top_attach">4</property>
-            <property name="width">1</property>
-            <property name="height">1</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="label14">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="ellipsize">end</property>
             <property name="label" translatable="yes">XXX</property>
             <property name="name">color14</property>
+            <layout>
+              <property name="left_attach">1</property>
+              <property name="top_attach">4</property>
+              <property name="column-span">1</property>
+              <property name="row-span">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">1</property>
-            <property name="top_attach">4</property>
-            <property name="width">1</property>
-            <property name="height">1</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="label24">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="ellipsize">end</property>
             <property name="label" translatable="yes">XXX</property>
             <property name="name">color24</property>
+            <layout>
+              <property name="left_attach">2</property>
+              <property name="top_attach">4</property>
+              <property name="column-span">1</property>
+              <property name="row-span">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">2</property>
-            <property name="top_attach">4</property>
-            <property name="width">1</property>
-            <property name="height">1</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="label34">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="ellipsize">end</property>
             <property name="label" translatable="yes">XXX</property>
             <property name="name">color34</property>
+            <layout>
+              <property name="left_attach">3</property>
+              <property name="top_attach">4</property>
+              <property name="column-span">1</property>
+              <property name="row-span">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">3</property>
-            <property name="top_attach">4</property>
-            <property name="width">1</property>
-            <property name="height">1</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="label44">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="ellipsize">end</property>
             <property name="label" translatable="yes">XXX</property>
             <property name="name">color44</property>
+            <layout>
+              <property name="left_attach">4</property>
+              <property name="top_attach">4</property>
+              <property name="column-span">1</property>
+              <property name="row-span">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">4</property>
-            <property name="top_attach">4</property>
-            <property name="width">1</property>
-            <property name="height">1</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="label54">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="ellipsize">end</property>
             <property name="label" translatable="yes">XXX</property>
             <property name="name">color54</property>
+            <layout>
+              <property name="left_attach">5</property>
+              <property name="top_attach">4</property>
+              <property name="column-span">1</property>
+              <property name="row-span">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">5</property>
-            <property name="top_attach">4</property>
-            <property name="width">1</property>
-            <property name="height">1</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="label64">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="ellipsize">end</property>
             <property name="label" translatable="yes">XXX</property>
             <property name="name">color64</property>
+            <layout>
+              <property name="left_attach">6</property>
+              <property name="top_attach">4</property>
+              <property name="column-span">1</property>
+              <property name="row-span">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">6</property>
-            <property name="top_attach">4</property>
-            <property name="width">1</property>
-            <property name="height">1</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="label74">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="ellipsize">end</property>
             <property name="label" translatable="yes">XXX</property>
             <property name="name">color74</property>
+            <layout>
+              <property name="left_attach">7</property>
+              <property name="top_attach">4</property>
+              <property name="column-span">1</property>
+              <property name="row-span">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">7</property>
-            <property name="top_attach">4</property>
-            <property name="width">1</property>
-            <property name="height">1</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="label84">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="ellipsize">end</property>
             <property name="label" translatable="yes">XXX</property>
             <property name="name">color84</property>
+            <layout>
+              <property name="left_attach">8</property>
+              <property name="top_attach">4</property>
+              <property name="column-span">1</property>
+              <property name="row-span">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">8</property>
-            <property name="top_attach">4</property>
-            <property name="width">1</property>
-            <property name="height">1</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="label94">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="ellipsize">end</property>
             <property name="label" translatable="yes">XXX</property>
             <property name="name">color94</property>
+            <layout>
+              <property name="left_attach">9</property>
+              <property name="top_attach">4</property>
+              <property name="column-span">1</property>
+              <property name="row-span">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">9</property>
-            <property name="top_attach">4</property>
-            <property name="width">1</property>
-            <property name="height">1</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="label104">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="ellipsize">end</property>
             <property name="label" translatable="yes">XXX</property>
             <property name="name">color104</property>
+            <layout>
+              <property name="left_attach">10</property>
+              <property name="top_attach">4</property>
+              <property name="column-span">1</property>
+              <property name="row-span">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">10</property>
-            <property name="top_attach">4</property>
-            <property name="width">1</property>
-            <property name="height">1</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="label114">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="ellipsize">end</property>
             <property name="label" translatable="yes">XXX</property>
             <property name="name">color114</property>
+            <layout>
+              <property name="left_attach">11</property>
+              <property name="top_attach">4</property>
+              <property name="column-span">1</property>
+              <property name="row-span">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">11</property>
-            <property name="top_attach">4</property>
-            <property name="width">1</property>
-            <property name="height">1</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="label124">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="ellipsize">end</property>
             <property name="label" translatable="yes">XXX</property>
             <property name="name">color124</property>
+            <layout>
+              <property name="left_attach">12</property>
+              <property name="top_attach">4</property>
+              <property name="column-span">1</property>
+              <property name="row-span">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">12</property>
-            <property name="top_attach">4</property>
-            <property name="width">1</property>
-            <property name="height">1</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="label134">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="ellipsize">end</property>
             <property name="label" translatable="yes">XXX</property>
             <property name="name">color134</property>
+            <layout>
+              <property name="left_attach">13</property>
+              <property name="top_attach">4</property>
+              <property name="column-span">1</property>
+              <property name="row-span">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">13</property>
-            <property name="top_attach">4</property>
-            <property name="width">1</property>
-            <property name="height">1</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="label144">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="ellipsize">end</property>
             <property name="label" translatable="yes">XXX</property>
             <property name="name">color144</property>
+            <layout>
+              <property name="left_attach">14</property>
+              <property name="top_attach">4</property>
+              <property name="column-span">1</property>
+              <property name="row-span">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">14</property>
-            <property name="top_attach">4</property>
-            <property name="width">1</property>
-            <property name="height">1</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="label5">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="ellipsize">end</property>
             <property name="label" translatable="yes">XXX</property>
             <property name="name">color5</property>
+            <layout>
+              <property name="left_attach">0</property>
+              <property name="top_attach">5</property>
+              <property name="column-span">1</property>
+              <property name="row-span">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">0</property>
-            <property name="top_attach">5</property>
-            <property name="width">1</property>
-            <property name="height">1</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="label15">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="ellipsize">end</property>
             <property name="label" translatable="yes">XXX</property>
             <property name="name">color15</property>
+            <layout>
+              <property name="left_attach">1</property>
+              <property name="top_attach">5</property>
+              <property name="column-span">1</property>
+              <property name="row-span">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">1</property>
-            <property name="top_attach">5</property>
-            <property name="width">1</property>
-            <property name="height">1</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="label25">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="ellipsize">end</property>
             <property name="label" translatable="yes">XXX</property>
             <property name="name">color25</property>
+            <layout>
+              <property name="left_attach">2</property>
+              <property name="top_attach">5</property>
+              <property name="column-span">1</property>
+              <property name="row-span">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">2</property>
-            <property name="top_attach">5</property>
-            <property name="width">1</property>
-            <property name="height">1</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="label35">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="ellipsize">end</property>
             <property name="label" translatable="yes">XXX</property>
             <property name="name">color35</property>
+            <layout>
+              <property name="left_attach">3</property>
+              <property name="top_attach">5</property>
+              <property name="column-span">1</property>
+              <property name="row-span">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">3</property>
-            <property name="top_attach">5</property>
-            <property name="width">1</property>
-            <property name="height">1</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="label45">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="ellipsize">end</property>
             <property name="label" translatable="yes">XXX</property>
             <property name="name">color45</property>
+            <layout>
+              <property name="left_attach">4</property>
+              <property name="top_attach">5</property>
+              <property name="column-span">1</property>
+              <property name="row-span">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">4</property>
-            <property name="top_attach">5</property>
-            <property name="width">1</property>
-            <property name="height">1</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="label55">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="ellipsize">end</property>
             <property name="label" translatable="yes">XXX</property>
             <property name="name">color55</property>
+            <layout>
+              <property name="left_attach">5</property>
+              <property name="top_attach">5</property>
+              <property name="column-span">1</property>
+              <property name="row-span">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">5</property>
-            <property name="top_attach">5</property>
-            <property name="width">1</property>
-            <property name="height">1</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="label65">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="ellipsize">end</property>
             <property name="label" translatable="yes">XXX</property>
             <property name="name">color65</property>
+            <layout>
+              <property name="left_attach">6</property>
+              <property name="top_attach">5</property>
+              <property name="column-span">1</property>
+              <property name="row-span">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">6</property>
-            <property name="top_attach">5</property>
-            <property name="width">1</property>
-            <property name="height">1</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="label75">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="ellipsize">end</property>
             <property name="label" translatable="yes">XXX</property>
             <property name="name">color75</property>
+            <layout>
+              <property name="left_attach">7</property>
+              <property name="top_attach">5</property>
+              <property name="column-span">1</property>
+              <property name="row-span">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">7</property>
-            <property name="top_attach">5</property>
-            <property name="width">1</property>
-            <property name="height">1</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="label85">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="ellipsize">end</property>
             <property name="label" translatable="yes">XXX</property>
             <property name="name">color85</property>
+            <layout>
+              <property name="left_attach">8</property>
+              <property name="top_attach">5</property>
+              <property name="column-span">1</property>
+              <property name="row-span">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">8</property>
-            <property name="top_attach">5</property>
-            <property name="width">1</property>
-            <property name="height">1</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="label95">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="ellipsize">end</property>
             <property name="label" translatable="yes">XXX</property>
             <property name="name">color95</property>
+            <layout>
+              <property name="left_attach">9</property>
+              <property name="top_attach">5</property>
+              <property name="column-span">1</property>
+              <property name="row-span">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">9</property>
-            <property name="top_attach">5</property>
-            <property name="width">1</property>
-            <property name="height">1</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="label105">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="ellipsize">end</property>
             <property name="label" translatable="yes">XXX</property>
             <property name="name">color105</property>
+            <layout>
+              <property name="left_attach">10</property>
+              <property name="top_attach">5</property>
+              <property name="column-span">1</property>
+              <property name="row-span">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">10</property>
-            <property name="top_attach">5</property>
-            <property name="width">1</property>
-            <property name="height">1</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="label115">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="ellipsize">end</property>
             <property name="label" translatable="yes">XXX</property>
             <property name="name">color115</property>
+            <layout>
+              <property name="left_attach">11</property>
+              <property name="top_attach">5</property>
+              <property name="column-span">1</property>
+              <property name="row-span">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">11</property>
-            <property name="top_attach">5</property>
-            <property name="width">1</property>
-            <property name="height">1</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="label125">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="ellipsize">end</property>
             <property name="label" translatable="yes">XXX</property>
             <property name="name">color125</property>
+            <layout>
+              <property name="left_attach">12</property>
+              <property name="top_attach">5</property>
+              <property name="column-span">1</property>
+              <property name="row-span">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">12</property>
-            <property name="top_attach">5</property>
-            <property name="width">1</property>
-            <property name="height">1</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="label135">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="ellipsize">end</property>
             <property name="label" translatable="yes">XXX</property>
             <property name="name">color135</property>
+            <layout>
+              <property name="left_attach">13</property>
+              <property name="top_attach">5</property>
+              <property name="column-span">1</property>
+              <property name="row-span">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">13</property>
-            <property name="top_attach">5</property>
-            <property name="width">1</property>
-            <property name="height">1</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="label145">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="ellipsize">end</property>
             <property name="label" translatable="yes">XXX</property>
             <property name="name">color145</property>
+            <layout>
+              <property name="left_attach">14</property>
+              <property name="top_attach">5</property>
+              <property name="column-span">1</property>
+              <property name="row-span">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">14</property>
-            <property name="top_attach">5</property>
-            <property name="width">1</property>
-            <property name="height">1</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="label6">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="ellipsize">end</property>
             <property name="label" translatable="yes">XXX</property>
             <property name="name">color6</property>
+            <layout>
+              <property name="left_attach">0</property>
+              <property name="top_attach">6</property>
+              <property name="column-span">1</property>
+              <property name="row-span">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">0</property>
-            <property name="top_attach">6</property>
-            <property name="width">1</property>
-            <property name="height">1</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="label16">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="ellipsize">end</property>
             <property name="label" translatable="yes">XXX</property>
             <property name="name">color16</property>
+            <layout>
+              <property name="left_attach">1</property>
+              <property name="top_attach">6</property>
+              <property name="column-span">1</property>
+              <property name="row-span">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">1</property>
-            <property name="top_attach">6</property>
-            <property name="width">1</property>
-            <property name="height">1</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="label26">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="ellipsize">end</property>
             <property name="label" translatable="yes">XXX</property>
             <property name="name">color26</property>
+            <layout>
+              <property name="left_attach">2</property>
+              <property name="top_attach">6</property>
+              <property name="column-span">1</property>
+              <property name="row-span">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">2</property>
-            <property name="top_attach">6</property>
-            <property name="width">1</property>
-            <property name="height">1</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="label36">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="ellipsize">end</property>
             <property name="label" translatable="yes">XXX</property>
             <property name="name">color36</property>
+            <layout>
+              <property name="left_attach">3</property>
+              <property name="top_attach">6</property>
+              <property name="column-span">1</property>
+              <property name="row-span">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">3</property>
-            <property name="top_attach">6</property>
-            <property name="width">1</property>
-            <property name="height">1</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="label46">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="ellipsize">end</property>
             <property name="label" translatable="yes">XXX</property>
             <property name="name">color46</property>
+            <layout>
+              <property name="left_attach">4</property>
+              <property name="top_attach">6</property>
+              <property name="column-span">1</property>
+              <property name="row-span">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">4</property>
-            <property name="top_attach">6</property>
-            <property name="width">1</property>
-            <property name="height">1</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="label56">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="ellipsize">end</property>
             <property name="label" translatable="yes">XXX</property>
             <property name="name">color56</property>
+            <layout>
+              <property name="left_attach">5</property>
+              <property name="top_attach">6</property>
+              <property name="column-span">1</property>
+              <property name="row-span">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">5</property>
-            <property name="top_attach">6</property>
-            <property name="width">1</property>
-            <property name="height">1</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="label66">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="ellipsize">end</property>
             <property name="label" translatable="yes">XXX</property>
             <property name="name">color66</property>
+            <layout>
+              <property name="left_attach">6</property>
+              <property name="top_attach">6</property>
+              <property name="column-span">1</property>
+              <property name="row-span">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">6</property>
-            <property name="top_attach">6</property>
-            <property name="width">1</property>
-            <property name="height">1</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="label76">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="ellipsize">end</property>
             <property name="label" translatable="yes">XXX</property>
             <property name="name">color76</property>
+            <layout>
+              <property name="left_attach">7</property>
+              <property name="top_attach">6</property>
+              <property name="column-span">1</property>
+              <property name="row-span">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">7</property>
-            <property name="top_attach">6</property>
-            <property name="width">1</property>
-            <property name="height">1</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="label86">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="ellipsize">end</property>
             <property name="label" translatable="yes">XXX</property>
             <property name="name">color86</property>
+            <layout>
+              <property name="left_attach">8</property>
+              <property name="top_attach">6</property>
+              <property name="column-span">1</property>
+              <property name="row-span">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">8</property>
-            <property name="top_attach">6</property>
-            <property name="width">1</property>
-            <property name="height">1</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="label96">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="ellipsize">end</property>
             <property name="label" translatable="yes">XXX</property>
             <property name="name">color96</property>
+            <layout>
+              <property name="left_attach">9</property>
+              <property name="top_attach">6</property>
+              <property name="column-span">1</property>
+              <property name="row-span">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">9</property>
-            <property name="top_attach">6</property>
-            <property name="width">1</property>
-            <property name="height">1</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="label106">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="ellipsize">end</property>
             <property name="label" translatable="yes">XXX</property>
             <property name="name">color106</property>
+            <layout>
+              <property name="left_attach">10</property>
+              <property name="top_attach">6</property>
+              <property name="column-span">1</property>
+              <property name="row-span">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">10</property>
-            <property name="top_attach">6</property>
-            <property name="width">1</property>
-            <property name="height">1</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="label116">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="ellipsize">end</property>
             <property name="label" translatable="yes">XXX</property>
             <property name="name">color116</property>
+            <layout>
+              <property name="left_attach">11</property>
+              <property name="top_attach">6</property>
+              <property name="column-span">1</property>
+              <property name="row-span">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">11</property>
-            <property name="top_attach">6</property>
-            <property name="width">1</property>
-            <property name="height">1</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="label126">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="ellipsize">end</property>
             <property name="label" translatable="yes">XXX</property>
             <property name="name">color126</property>
+            <layout>
+              <property name="left_attach">12</property>
+              <property name="top_attach">6</property>
+              <property name="column-span">1</property>
+              <property name="row-span">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">12</property>
-            <property name="top_attach">6</property>
-            <property name="width">1</property>
-            <property name="height">1</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="label136">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="ellipsize">end</property>
             <property name="label" translatable="yes">XXX</property>
             <property name="name">color136</property>
+            <layout>
+              <property name="left_attach">13</property>
+              <property name="top_attach">6</property>
+              <property name="column-span">1</property>
+              <property name="row-span">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">13</property>
-            <property name="top_attach">6</property>
-            <property name="width">1</property>
-            <property name="height">1</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="label146">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="ellipsize">end</property>
             <property name="label" translatable="yes">XXX</property>
             <property name="name">color146</property>
+            <layout>
+              <property name="left_attach">14</property>
+              <property name="top_attach">6</property>
+              <property name="column-span">1</property>
+              <property name="row-span">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">14</property>
-            <property name="top_attach">6</property>
-            <property name="width">1</property>
-            <property name="height">1</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="label7">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="ellipsize">end</property>
             <property name="label" translatable="yes">XXX</property>
             <property name="name">color7</property>
+            <layout>
+              <property name="left_attach">0</property>
+              <property name="top_attach">7</property>
+              <property name="column-span">1</property>
+              <property name="row-span">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">0</property>
-            <property name="top_attach">7</property>
-            <property name="width">1</property>
-            <property name="height">1</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="label17">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="ellipsize">end</property>
             <property name="label" translatable="yes">XXX</property>
             <property name="name">color17</property>
+            <layout>
+              <property name="left_attach">1</property>
+              <property name="top_attach">7</property>
+              <property name="column-span">1</property>
+              <property name="row-span">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">1</property>
-            <property name="top_attach">7</property>
-            <property name="width">1</property>
-            <property name="height">1</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="label27">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="ellipsize">end</property>
             <property name="label" translatable="yes">XXX</property>
             <property name="name">color27</property>
+            <layout>
+              <property name="left_attach">2</property>
+              <property name="top_attach">7</property>
+              <property name="column-span">1</property>
+              <property name="row-span">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">2</property>
-            <property name="top_attach">7</property>
-            <property name="width">1</property>
-            <property name="height">1</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="label37">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="ellipsize">end</property>
             <property name="label" translatable="yes">XXX</property>
             <property name="name">color37</property>
+            <layout>
+              <property name="left_attach">3</property>
+              <property name="top_attach">7</property>
+              <property name="column-span">1</property>
+              <property name="row-span">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">3</property>
-            <property name="top_attach">7</property>
-            <property name="width">1</property>
-            <property name="height">1</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="label47">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="ellipsize">end</property>
             <property name="label" translatable="yes">XXX</property>
             <property name="name">color47</property>
+            <layout>
+              <property name="left_attach">4</property>
+              <property name="top_attach">7</property>
+              <property name="column-span">1</property>
+              <property name="row-span">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">4</property>
-            <property name="top_attach">7</property>
-            <property name="width">1</property>
-            <property name="height">1</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="label57">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="ellipsize">end</property>
             <property name="label" translatable="yes">XXX</property>
             <property name="name">color57</property>
+            <layout>
+              <property name="left_attach">5</property>
+              <property name="top_attach">7</property>
+              <property name="column-span">1</property>
+              <property name="row-span">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">5</property>
-            <property name="top_attach">7</property>
-            <property name="width">1</property>
-            <property name="height">1</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="label67">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="ellipsize">end</property>
             <property name="label" translatable="yes">XXX</property>
             <property name="name">color67</property>
+            <layout>
+              <property name="left_attach">6</property>
+              <property name="top_attach">7</property>
+              <property name="column-span">1</property>
+              <property name="row-span">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">6</property>
-            <property name="top_attach">7</property>
-            <property name="width">1</property>
-            <property name="height">1</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="label77">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="ellipsize">end</property>
             <property name="label" translatable="yes">XXX</property>
             <property name="name">color77</property>
+            <layout>
+              <property name="left_attach">7</property>
+              <property name="top_attach">7</property>
+              <property name="column-span">1</property>
+              <property name="row-span">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">7</property>
-            <property name="top_attach">7</property>
-            <property name="width">1</property>
-            <property name="height">1</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="label87">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="ellipsize">end</property>
             <property name="label" translatable="yes">XXX</property>
             <property name="name">color87</property>
+            <layout>
+              <property name="left_attach">8</property>
+              <property name="top_attach">7</property>
+              <property name="column-span">1</property>
+              <property name="row-span">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">8</property>
-            <property name="top_attach">7</property>
-            <property name="width">1</property>
-            <property name="height">1</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="label97">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="ellipsize">end</property>
             <property name="label" translatable="yes">XXX</property>
             <property name="name">color97</property>
+            <layout>
+              <property name="left_attach">9</property>
+              <property name="top_attach">7</property>
+              <property name="column-span">1</property>
+              <property name="row-span">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">9</property>
-            <property name="top_attach">7</property>
-            <property name="width">1</property>
-            <property name="height">1</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="label107">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="ellipsize">end</property>
             <property name="label" translatable="yes">XXX</property>
             <property name="name">color107</property>
+            <layout>
+              <property name="left_attach">10</property>
+              <property name="top_attach">7</property>
+              <property name="column-span">1</property>
+              <property name="row-span">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">10</property>
-            <property name="top_attach">7</property>
-            <property name="width">1</property>
-            <property name="height">1</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="label117">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="ellipsize">end</property>
             <property name="label" translatable="yes">XXX</property>
             <property name="name">color117</property>
+            <layout>
+              <property name="left_attach">11</property>
+              <property name="top_attach">7</property>
+              <property name="column-span">1</property>
+              <property name="row-span">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">11</property>
-            <property name="top_attach">7</property>
-            <property name="width">1</property>
-            <property name="height">1</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="label127">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="ellipsize">end</property>
             <property name="label" translatable="yes">XXX</property>
             <property name="name">color127</property>
+            <layout>
+              <property name="left_attach">12</property>
+              <property name="top_attach">7</property>
+              <property name="column-span">1</property>
+              <property name="row-span">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">12</property>
-            <property name="top_attach">7</property>
-            <property name="width">1</property>
-            <property name="height">1</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="label137">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="ellipsize">end</property>
             <property name="label" translatable="yes">XXX</property>
             <property name="name">color137</property>
+            <layout>
+              <property name="left_attach">13</property>
+              <property name="top_attach">7</property>
+              <property name="column-span">1</property>
+              <property name="row-span">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">13</property>
-            <property name="top_attach">7</property>
-            <property name="width">1</property>
-            <property name="height">1</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="label147">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="ellipsize">end</property>
             <property name="label" translatable="yes">XXX</property>
             <property name="name">color147</property>
+            <layout>
+              <property name="left_attach">14</property>
+              <property name="top_attach">7</property>
+              <property name="column-span">1</property>
+              <property name="row-span">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">14</property>
-            <property name="top_attach">7</property>
-            <property name="width">1</property>
-            <property name="height">1</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="label8">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="ellipsize">end</property>
             <property name="label" translatable="yes">XXX</property>
             <property name="name">color8</property>
+            <layout>
+              <property name="left_attach">0</property>
+              <property name="top_attach">8</property>
+              <property name="column-span">1</property>
+              <property name="row-span">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">0</property>
-            <property name="top_attach">8</property>
-            <property name="width">1</property>
-            <property name="height">1</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="label18">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="ellipsize">end</property>
             <property name="label" translatable="yes">XXX</property>
             <property name="name">color18</property>
+            <layout>
+              <property name="left_attach">1</property>
+              <property name="top_attach">8</property>
+              <property name="column-span">1</property>
+              <property name="row-span">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">1</property>
-            <property name="top_attach">8</property>
-            <property name="width">1</property>
-            <property name="height">1</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="label28">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="ellipsize">end</property>
             <property name="label" translatable="yes">XXX</property>
             <property name="name">color28</property>
+            <layout>
+              <property name="left_attach">2</property>
+              <property name="top_attach">8</property>
+              <property name="column-span">1</property>
+              <property name="row-span">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">2</property>
-            <property name="top_attach">8</property>
-            <property name="width">1</property>
-            <property name="height">1</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="label38">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="ellipsize">end</property>
             <property name="label" translatable="yes">XXX</property>
             <property name="name">color38</property>
+            <layout>
+              <property name="left_attach">3</property>
+              <property name="top_attach">8</property>
+              <property name="column-span">1</property>
+              <property name="row-span">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">3</property>
-            <property name="top_attach">8</property>
-            <property name="width">1</property>
-            <property name="height">1</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="label48">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="ellipsize">end</property>
             <property name="label" translatable="yes">XXX</property>
             <property name="name">color48</property>
+            <layout>
+              <property name="left_attach">4</property>
+              <property name="top_attach">8</property>
+              <property name="column-span">1</property>
+              <property name="row-span">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">4</property>
-            <property name="top_attach">8</property>
-            <property name="width">1</property>
-            <property name="height">1</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="label58">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="ellipsize">end</property>
             <property name="label" translatable="yes">XXX</property>
             <property name="name">color58</property>
+            <layout>
+              <property name="left_attach">5</property>
+              <property name="top_attach">8</property>
+              <property name="column-span">1</property>
+              <property name="row-span">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">5</property>
-            <property name="top_attach">8</property>
-            <property name="width">1</property>
-            <property name="height">1</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="label68">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="ellipsize">end</property>
             <property name="label" translatable="yes">XXX</property>
             <property name="name">color68</property>
+            <layout>
+              <property name="left_attach">6</property>
+              <property name="top_attach">8</property>
+              <property name="column-span">1</property>
+              <property name="row-span">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">6</property>
-            <property name="top_attach">8</property>
-            <property name="width">1</property>
-            <property name="height">1</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="label78">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="ellipsize">end</property>
             <property name="label" translatable="yes">XXX</property>
             <property name="name">color78</property>
+            <layout>
+              <property name="left_attach">7</property>
+              <property name="top_attach">8</property>
+              <property name="column-span">1</property>
+              <property name="row-span">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">7</property>
-            <property name="top_attach">8</property>
-            <property name="width">1</property>
-            <property name="height">1</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="label88">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="ellipsize">end</property>
             <property name="label" translatable="yes">XXX</property>
             <property name="name">color88</property>
+            <layout>
+              <property name="left_attach">8</property>
+              <property name="top_attach">8</property>
+              <property name="column-span">1</property>
+              <property name="row-span">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">8</property>
-            <property name="top_attach">8</property>
-            <property name="width">1</property>
-            <property name="height">1</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="label98">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="ellipsize">end</property>
             <property name="label" translatable="yes">XXX</property>
             <property name="name">color98</property>
+            <layout>
+              <property name="left_attach">9</property>
+              <property name="top_attach">8</property>
+              <property name="column-span">1</property>
+              <property name="row-span">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">9</property>
-            <property name="top_attach">8</property>
-            <property name="width">1</property>
-            <property name="height">1</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="label108">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="ellipsize">end</property>
             <property name="label" translatable="yes">XXX</property>
             <property name="name">color108</property>
+            <layout>
+              <property name="left_attach">10</property>
+              <property name="top_attach">8</property>
+              <property name="column-span">1</property>
+              <property name="row-span">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">10</property>
-            <property name="top_attach">8</property>
-            <property name="width">1</property>
-            <property name="height">1</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="label118">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="ellipsize">end</property>
             <property name="label" translatable="yes">XXX</property>
             <property name="name">color118</property>
+            <layout>
+              <property name="left_attach">11</property>
+              <property name="top_attach">8</property>
+              <property name="column-span">1</property>
+              <property name="row-span">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">11</property>
-            <property name="top_attach">8</property>
-            <property name="width">1</property>
-            <property name="height">1</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="label128">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="ellipsize">end</property>
             <property name="label" translatable="yes">XXX</property>
             <property name="name">color128</property>
+            <layout>
+              <property name="left_attach">12</property>
+              <property name="top_attach">8</property>
+              <property name="column-span">1</property>
+              <property name="row-span">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">12</property>
-            <property name="top_attach">8</property>
-            <property name="width">1</property>
-            <property name="height">1</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="label138">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="ellipsize">end</property>
             <property name="label" translatable="yes">XXX</property>
             <property name="name">color138</property>
+            <layout>
+              <property name="left_attach">13</property>
+              <property name="top_attach">8</property>
+              <property name="column-span">1</property>
+              <property name="row-span">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">13</property>
-            <property name="top_attach">8</property>
-            <property name="width">1</property>
-            <property name="height">1</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="label148">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="ellipsize">end</property>
             <property name="label" translatable="yes">XXX</property>
             <property name="name">color148</property>
+            <layout>
+              <property name="left_attach">14</property>
+              <property name="top_attach">8</property>
+              <property name="column-span">1</property>
+              <property name="row-span">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">14</property>
-            <property name="top_attach">8</property>
-            <property name="width">1</property>
-            <property name="height">1</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="label9">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="ellipsize">end</property>
             <property name="label" translatable="yes">XXX</property>
             <property name="name">color9</property>
+            <layout>
+              <property name="left_attach">0</property>
+              <property name="top_attach">9</property>
+              <property name="column-span">1</property>
+              <property name="row-span">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">0</property>
-            <property name="top_attach">9</property>
-            <property name="width">1</property>
-            <property name="height">1</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="label19">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="ellipsize">end</property>
             <property name="label" translatable="yes">XXX</property>
             <property name="name">color19</property>
+            <layout>
+              <property name="left_attach">1</property>
+              <property name="top_attach">9</property>
+              <property name="column-span">1</property>
+              <property name="row-span">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">1</property>
-            <property name="top_attach">9</property>
-            <property name="width">1</property>
-            <property name="height">1</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="label29">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="ellipsize">end</property>
             <property name="label" translatable="yes">XXX</property>
             <property name="name">color29</property>
+            <layout>
+              <property name="left_attach">2</property>
+              <property name="top_attach">9</property>
+              <property name="column-span">1</property>
+              <property name="row-span">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">2</property>
-            <property name="top_attach">9</property>
-            <property name="width">1</property>
-            <property name="height">1</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="label39">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="ellipsize">end</property>
             <property name="label" translatable="yes">XXX</property>
             <property name="name">color39</property>
+            <layout>
+              <property name="left_attach">3</property>
+              <property name="top_attach">9</property>
+              <property name="column-span">1</property>
+              <property name="row-span">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">3</property>
-            <property name="top_attach">9</property>
-            <property name="width">1</property>
-            <property name="height">1</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="label49">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="ellipsize">end</property>
             <property name="label" translatable="yes">XXX</property>
             <property name="name">color49</property>
+            <layout>
+              <property name="left_attach">4</property>
+              <property name="top_attach">9</property>
+              <property name="column-span">1</property>
+              <property name="row-span">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">4</property>
-            <property name="top_attach">9</property>
-            <property name="width">1</property>
-            <property name="height">1</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="label59">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="ellipsize">end</property>
             <property name="label" translatable="yes">XXX</property>
             <property name="name">color59</property>
+            <layout>
+              <property name="left_attach">5</property>
+              <property name="top_attach">9</property>
+              <property name="column-span">1</property>
+              <property name="row-span">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">5</property>
-            <property name="top_attach">9</property>
-            <property name="width">1</property>
-            <property name="height">1</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="label69">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="ellipsize">end</property>
             <property name="label" translatable="yes">XXX</property>
             <property name="name">color69</property>
+            <layout>
+              <property name="left_attach">6</property>
+              <property name="top_attach">9</property>
+              <property name="column-span">1</property>
+              <property name="row-span">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">6</property>
-            <property name="top_attach">9</property>
-            <property name="width">1</property>
-            <property name="height">1</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="label79">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="ellipsize">end</property>
             <property name="label" translatable="yes">XXX</property>
             <property name="name">color79</property>
+            <layout>
+              <property name="left_attach">7</property>
+              <property name="top_attach">9</property>
+              <property name="column-span">1</property>
+              <property name="row-span">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">7</property>
-            <property name="top_attach">9</property>
-            <property name="width">1</property>
-            <property name="height">1</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="label89">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="ellipsize">end</property>
             <property name="label" translatable="yes">XXX</property>
             <property name="name">color89</property>
+            <layout>
+              <property name="left_attach">8</property>
+              <property name="top_attach">9</property>
+              <property name="column-span">1</property>
+              <property name="row-span">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">8</property>
-            <property name="top_attach">9</property>
-            <property name="width">1</property>
-            <property name="height">1</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="label99">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="ellipsize">end</property>
             <property name="label" translatable="yes">XXX</property>
             <property name="name">color99</property>
+            <layout>
+              <property name="left_attach">9</property>
+              <property name="top_attach">9</property>
+              <property name="column-span">1</property>
+              <property name="row-span">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">9</property>
-            <property name="top_attach">9</property>
-            <property name="width">1</property>
-            <property name="height">1</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="label109">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="ellipsize">end</property>
             <property name="label" translatable="yes">XXX</property>
             <property name="name">color109</property>
+            <layout>
+              <property name="left_attach">10</property>
+              <property name="top_attach">9</property>
+              <property name="column-span">1</property>
+              <property name="row-span">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">10</property>
-            <property name="top_attach">9</property>
-            <property name="width">1</property>
-            <property name="height">1</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="label119">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="ellipsize">end</property>
             <property name="label" translatable="yes">XXX</property>
             <property name="name">color119</property>
+            <layout>
+              <property name="left_attach">11</property>
+              <property name="top_attach">9</property>
+              <property name="column-span">1</property>
+              <property name="row-span">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">11</property>
-            <property name="top_attach">9</property>
-            <property name="width">1</property>
-            <property name="height">1</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="label129">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="ellipsize">end</property>
             <property name="label" translatable="yes">XXX</property>
             <property name="name">color129</property>
+            <layout>
+              <property name="left_attach">12</property>
+              <property name="top_attach">9</property>
+              <property name="column-span">1</property>
+              <property name="row-span">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">12</property>
-            <property name="top_attach">9</property>
-            <property name="width">1</property>
-            <property name="height">1</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="label139">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="ellipsize">end</property>
             <property name="label" translatable="yes">XXX</property>
             <property name="name">color139</property>
+            <layout>
+              <property name="left_attach">13</property>
+              <property name="top_attach">9</property>
+              <property name="column-span">1</property>
+              <property name="row-span">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">13</property>
-            <property name="top_attach">9</property>
-            <property name="width">1</property>
-            <property name="height">1</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="label149">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="ellipsize">end</property>
             <property name="label" translatable="yes">XXX</property>
             <property name="name">color149</property>
+            <layout>
+              <property name="left_attach">14</property>
+              <property name="top_attach">9</property>
+              <property name="column-span">1</property>
+              <property name="row-span">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">14</property>
-            <property name="top_attach">9</property>
-            <property name="width">1</property>
-            <property name="height">1</property>
-          </packing>
         </child>
       </object>
     </child>

diff --git a/testsuite/reftests/no-colors.ref.ui b/testsuite/reftests/no-colors.ref.ui
index 696d4d4491747ad3f6c80c0996e693a96475f815..3278c9f53dcef9ed627a41449e54c3903a65226c 100644 (file)
--- a/testsuite/reftests/no-colors.ref.ui
+++ b/testsuite/reftests/no-colors.ref.ui
@@ -1,13 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
-  <!-- interface-requires gtk+ 3.0 -->
   <object class="GtkWindow" id="window1">
-    <property name="can_focus">False</property>
     <property name="type">popup</property>
     <child>
       <object class="GtkLabel" id="label1">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
         <property name="label" translatable="yes">no colors for you</property>
       </object>
     </child>

diff --git a/testsuite/reftests/no-colors.ui b/testsuite/reftests/no-colors.ui
index 696d4d4491747ad3f6c80c0996e693a96475f815..3278c9f53dcef9ed627a41449e54c3903a65226c 100644 (file)
--- a/testsuite/reftests/no-colors.ui
+++ b/testsuite/reftests/no-colors.ui
@@ -1,13 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
-  <!-- interface-requires gtk+ 3.0 -->
   <object class="GtkWindow" id="window1">
-    <property name="can_focus">False</property>
     <property name="type">popup</property>
     <child>
       <object class="GtkLabel" id="label1">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
         <property name="label" translatable="yes">no colors for you</property>
       </object>
     </child>

diff --git a/testsuite/reftests/nonresizable-size.ref.ui b/testsuite/reftests/nonresizable-size.ref.ui
index 35dd4092f4a515a4d7c48ccb20ec35a4bbad751b..56115658feb038839371353407f39859bc504ba8 100644 (file)
--- a/testsuite/reftests/nonresizable-size.ref.ui
+++ b/testsuite/reftests/nonresizable-size.ref.ui
@@ -1,13 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
-  <!-- interface-requires gtk+ 3.0 -->
   <object class="GtkWindow" id="window1">
-    <property name="can_focus">False</property>
     <property name="type">popup</property>
     <child>
       <object class="GtkLabel" id="label1">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
         <property name="label" translatable="yes">Hello World</property>
       </object>
     </child>

diff --git a/testsuite/reftests/nonresizable-size.ui b/testsuite/reftests/nonresizable-size.ui
index 0a777f0e7cb0f2fa7c3697b1208da26cc84be439..532136d2823999985499084b154160ee128539ed 100644 (file)
--- a/testsuite/reftests/nonresizable-size.ui
+++ b/testsuite/reftests/nonresizable-size.ui
@@ -1,14 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
-  <!-- interface-requires gtk+ 3.0 -->
   <object class="GtkWindow" id="window1">
-    <property name="can_focus">False</property>
     <property name="type">popup</property>
-    <property name="resizable">False</property>
+    <property name="resizable">0</property>
     <child>
       <object class="GtkLabel" id="label1">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
         <property name="label" translatable="yes">Hello World</property>
         <property name="ellipsize">end</property>
       </object>

diff --git a/testsuite/reftests/notebook-tab-position.ref.ui b/testsuite/reftests/notebook-tab-position.ref.ui
index f71c60c584a1f8f8669bd5fe770e4e8d2bcfa084..c536009d684a59de784c4523d97b9332f656ce7a 100644 (file)
--- a/testsuite/reftests/notebook-tab-position.ref.ui
+++ b/testsuite/reftests/notebook-tab-position.ref.ui
@@ -1,32 +1,29 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!-- Generated with glade 3.18.1 -->
 <interface>
   <requires lib="gtk+" version="3.12"/>
   <object class="GtkWindow" id="window1">
-    <property name="can_focus">False</property>
     <property name="type">popup</property>
     <child>
       <object class="GtkNotebook" id="notebook1">
         <property name="width_request">50</property>
         <property name="height_request">50</property>
-        <property name="visible">True</property>
-        <property name="can_focus">True</property>
+        <property name="can_focus">1</property>
         <property name="tab_pos">bottom</property>
         <style>
-          <class name="reference" />
+          <class name="reference"/>
         </style>
         <child>
-          <object class="GtkLabel" id="label2">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
-            <property name="label" translatable="yes">Contents</property>
-          </object>
-        </child>
-        <child type="tab">
-          <object class="GtkLabel" id="label1">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
-            <property name="label" translatable="yes">Tab</property>
+          <object class="GtkNotebookPage">
+            <property name="child">
+              <object class="GtkLabel" id="label2">
+                <property name="label" translatable="yes">Contents</property>
+              </object>
+            </property>
+            <property name="tab">
+              <object class="GtkLabel" id="label1">
+                <property name="label" translatable="yes">Tab</property>
+              </object>
+            </property>
           </object>
         </child>
       </object>

diff --git a/testsuite/reftests/notebook-tab-position.ui b/testsuite/reftests/notebook-tab-position.ui
index 2fdee4c00b991d4019cb8246d73a0c59b96120ac..209f3dc272b3b623266d34b0dee535d57983fa78 100644 (file)
--- a/testsuite/reftests/notebook-tab-position.ui
+++ b/testsuite/reftests/notebook-tab-position.ui
@@ -1,31 +1,28 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!-- Generated with glade 3.18.1 -->
 <interface>
   <requires lib="gtk+" version="3.12"/>
   <object class="GtkWindow" id="window1">
-    <property name="can_focus">False</property>
     <property name="type">popup</property>
     <child>
       <object class="GtkNotebook" id="notebook1">
         <property name="width_request">50</property>
         <property name="height_request">50</property>
-        <property name="visible">True</property>
-        <property name="can_focus">True</property>
+        <property name="can_focus">1</property>
         <style>
-          <class name="test" />
+          <class name="test"/>
         </style>
         <child>
-          <object class="GtkLabel" id="label2">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
-            <property name="label" translatable="yes">Contents</property>
-          </object>
-        </child>
-        <child type="tab">
-          <object class="GtkLabel" id="label1">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
-            <property name="label" translatable="yes">Tab</property>
+          <object class="GtkNotebookPage">
+            <property name="child">
+              <object class="GtkLabel" id="label2">
+                <property name="label" translatable="yes">Contents</property>
+              </object>
+            </property>
+            <property name="tab">
+              <object class="GtkLabel" id="label1">
+                <property name="label" translatable="yes">Tab</property>
+              </object>
+            </property>
           </object>
         </child>
       </object>

diff --git a/testsuite/reftests/nth-child.ref.ui b/testsuite/reftests/nth-child.ref.ui
index 0ac156c89d658f76214fbc82ebc4c0c50ba35fda..f8143de95e3a4a37703e653beb178fa5384307c8 100644 (file)
--- a/testsuite/reftests/nth-child.ref.ui
+++ b/testsuite/reftests/nth-child.ref.ui
@@ -1,210 +1,156 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
-  <!-- interface-requires gtk+ 3.0 -->
   <object class="GtkWindow" id="window1">
-    <property name="can_focus">False</property>
     <property name="type">popup</property>
     <child>
       <object class="GtkGrid" id="grid1">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
         <property name="orientation">vertical</property>
         <child>
           <object class="GtkLabel" id="label1">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="label" translatable="yes">1</property>
             <property name="name">ref1</property>
           </object>
         </child>
         <child>
           <object class="GtkLabel" id="label2">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="label" translatable="yes">2</property>
             <property name="name">ref2</property>
           </object>
         </child>
         <child>
           <object class="GtkLabel" id="label8">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="label" translatable="yes">3</property>
             <property name="name">ref3</property>
           </object>
         </child>
         <child>
           <object class="GtkLabel" id="label3">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="label" translatable="yes">4 = 2 * 2</property>
             <property name="name">ref4</property>
           </object>
         </child>
         <child>
           <object class="GtkLabel" id="label9">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="label" translatable="yes">5</property>
             <property name="name">ref5</property>
           </object>
         </child>
         <child>
           <object class="GtkLabel" id="label10">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="label" translatable="yes">6 = 2 * 3</property>
             <property name="name">ref6</property>
           </object>
         </child>
         <child>
           <object class="GtkLabel" id="label11">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="label" translatable="yes">7</property>
             <property name="name">ref7</property>
           </object>
         </child>
         <child>
           <object class="GtkLabel" id="label4">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="label" translatable="yes">8 = 2 * 2 * 2</property>
             <property name="name">ref8</property>
           </object>
         </child>
         <child>
           <object class="GtkLabel" id="label12">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="label" translatable="yes">9 = 3 * 3</property>
             <property name="name">ref9</property>
           </object>
         </child>
         <child>
           <object class="GtkLabel" id="label5">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="label" translatable="yes">10 = 2 * 5</property>
             <property name="name">ref10</property>
           </object>
         </child>
         <child>
           <object class="GtkLabel" id="label14">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="label" translatable="yes">11</property>
             <property name="name">ref11</property>
           </object>
         </child>
         <child>
           <object class="GtkLabel" id="label13">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="label" translatable="yes">12 = 2 * 2 * 3</property>
             <property name="name">ref12</property>
           </object>
         </child>
         <child>
           <object class="GtkLabel" id="label7">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="label" translatable="yes">13</property>
             <property name="name">ref13</property>
           </object>
         </child>
         <child>
           <object class="GtkLabel" id="label15">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="label" translatable="yes">14 = 2 * 7</property>
             <property name="name">ref14</property>
           </object>
         </child>
         <child>
           <object class="GtkLabel" id="label16">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="label" translatable="yes">15 = 3 * 5</property>
             <property name="name">ref15</property>
           </object>
         </child>
         <child>
           <object class="GtkLabel" id="label17">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="label" translatable="yes">16 = 2 * 2 * 2 * 2</property>
             <property name="name">ref16</property>
           </object>
         </child>
         <child>
           <object class="GtkLabel" id="label6">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="label" translatable="yes">17</property>
             <property name="name">ref17</property>
           </object>
         </child>
         <child>
           <object class="GtkLabel" id="label18">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="label" translatable="yes">18 = 2 * 3 * 3</property>
             <property name="name">ref18</property>
           </object>
         </child>
         <child>
           <object class="GtkLabel" id="label19">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="label" translatable="yes">19</property>
             <property name="name">ref19</property>
           </object>
         </child>
         <child>
           <object class="GtkLabel" id="label21">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="label" translatable="yes">20 = 2 * 2 * 5</property>
             <property name="name">ref20</property>
           </object>
         </child>
         <child>
           <object class="GtkLabel" id="label20">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="label" translatable="yes">21 = 3 * 7</property>
             <property name="name">ref21</property>
           </object>
         </child>
         <child>
           <object class="GtkLabel" id="label22">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="label" translatable="yes">22 = 2 * 11</property>
             <property name="name">ref22</property>
           </object>
         </child>
         <child>
           <object class="GtkLabel" id="label23">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="label" translatable="yes">23</property>
             <property name="name">ref23</property>
           </object>
         </child>
         <child>
           <object class="GtkLabel" id="label24">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="label" translatable="yes">24 = 2 * 2 * 2 * 3</property>
             <property name="name">ref24</property>
           </object>
         </child>
         <child>
           <object class="GtkLabel" id="label25">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="label" translatable="yes">25 = 5 * 5</property>
             <property name="name">ref25</property>
           </object>

diff --git a/testsuite/reftests/nth-child.ui b/testsuite/reftests/nth-child.ui
index e43bfb36f36914eef75cd658023e47f5d0397aab..b8001fd18c633b89bf2f04f3180908f2bbee441f 100644 (file)
--- a/testsuite/reftests/nth-child.ui
+++ b/testsuite/reftests/nth-child.ui
@@ -1,186 +1,132 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
-  <!-- interface-requires gtk+ 3.0 -->
   <object class="GtkWindow" id="window1">
-    <property name="can_focus">False</property>
     <property name="type">popup</property>
     <child>
       <object class="GtkBox" id="box1">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
         <property name="orientation">vertical</property>
         <child>
           <object class="GtkLabel" id="label1">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="label" translatable="yes">1</property>
           </object>
         </child>
         <child>
           <object class="GtkLabel" id="label2">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="label" translatable="yes">2</property>
           </object>
         </child>
         <child>
           <object class="GtkLabel" id="label8">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="label" translatable="yes">3</property>
           </object>
         </child>
         <child>
           <object class="GtkLabel" id="label3">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="label" translatable="yes">4 = 2 * 2</property>
           </object>
         </child>
         <child>
           <object class="GtkLabel" id="label9">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="label" translatable="yes">5</property>
           </object>
         </child>
         <child>
           <object class="GtkLabel" id="label10">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="label" translatable="yes">6 = 2 * 3</property>
           </object>
         </child>
         <child>
           <object class="GtkLabel" id="label11">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="label" translatable="yes">7</property>
           </object>
         </child>
         <child>
           <object class="GtkLabel" id="label4">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="label" translatable="yes">8 = 2 * 2 * 2</property>
           </object>
         </child>
         <child>
           <object class="GtkLabel" id="label12">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="label" translatable="yes">9 = 3 * 3</property>
           </object>
         </child>
         <child>
           <object class="GtkLabel" id="label5">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="label" translatable="yes">10 = 2 * 5</property>
           </object>
         </child>
         <child>
           <object class="GtkLabel" id="label14">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="label" translatable="yes">11</property>
           </object>
         </child>
         <child>
           <object class="GtkLabel" id="label13">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="label" translatable="yes">12 = 2 * 2 * 3</property>
           </object>
         </child>
         <child>
           <object class="GtkLabel" id="label7">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="label" translatable="yes">13</property>
           </object>
         </child>
         <child>
           <object class="GtkLabel" id="label15">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="label" translatable="yes">14 = 2 * 7</property>
           </object>
         </child>
         <child>
           <object class="GtkLabel" id="label16">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="label" translatable="yes">15 = 3 * 5</property>
           </object>
         </child>
         <child>
           <object class="GtkLabel" id="label17">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="label" translatable="yes">16 = 2 * 2 * 2 * 2</property>
           </object>
         </child>
         <child>
           <object class="GtkLabel" id="label6">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="label" translatable="yes">17</property>
           </object>
         </child>
         <child>
           <object class="GtkLabel" id="label18">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="label" translatable="yes">18 = 2 * 3 * 3</property>
           </object>
         </child>
         <child>
           <object class="GtkLabel" id="label19">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="label" translatable="yes">19</property>
           </object>
         </child>
         <child>
           <object class="GtkLabel" id="label21">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="label" translatable="yes">20 = 2 * 2 * 5</property>
           </object>
         </child>
         <child>
           <object class="GtkLabel" id="label20">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="label" translatable="yes">21 = 3 * 7</property>
           </object>
         </child>
         <child>
           <object class="GtkLabel" id="label22">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="label" translatable="yes">22 = 2 * 11</property>
           </object>
         </child>
         <child>
           <object class="GtkLabel" id="label23">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="label" translatable="yes">23</property>
           </object>
         </child>
         <child>
           <object class="GtkLabel" id="label24">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="label" translatable="yes">24 = 2 * 2 * 2 * 3</property>
           </object>
         </child>
         <child>
           <object class="GtkLabel" id="label25">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="label" translatable="yes">25 = 5 * 5</property>
           </object>
         </child>

diff --git a/testsuite/reftests/opacity-initial.ref.ui b/testsuite/reftests/opacity-initial.ref.ui
index 12403517bdcd8dde767225dc416a0ccaa68c8614..40232e76a71ffd83ac96bfa8779feb217a1fff86 100644 (file)
--- a/testsuite/reftests/opacity-initial.ref.ui
+++ b/testsuite/reftests/opacity-initial.ref.ui
@@ -1,11 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!-- Generated with glade 3.18.1 -->
 <interface>
   <requires lib="gtk+" version="3.12"/>
   <object class="GtkWindow" id="window1">
     <property name="width_request">200</property>
     <property name="height_request">100</property>
-    <property name="can_focus">False</property>
     <property name="type">popup</property>
   </object>
 </interface>

diff --git a/testsuite/reftests/opacity-initial.ui b/testsuite/reftests/opacity-initial.ui
index 7d8a4b2af86b31b5a4dd98067240ed7b5b66bed3..cc08a1808721848efd9c68c6cf0dfa0f496c99d1 100644 (file)
--- a/testsuite/reftests/opacity-initial.ui
+++ b/testsuite/reftests/opacity-initial.ui
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
 <interface>
   <requires lib="gtk+" version="3.12"/>
   <object class="GtkWindow" id="window1">

diff --git a/testsuite/reftests/opacity.ref.ui b/testsuite/reftests/opacity.ref.ui
index d810792507c19d7d4464b1714db619e20174e321..535a35cb4e9754351a558b28a30802f9b97ed919 100644 (file)
--- a/testsuite/reftests/opacity.ref.ui
+++ b/testsuite/reftests/opacity.ref.ui
@@ -1,28 +1,19 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
-  <!-- interface-requires gtk+ 3.0 -->
   <object class="GtkWindow" id="window1">
-    <property name="can_focus">False</property>
     <property name="type">popup</property>
     <child>
       <object class="GtkBox" id="box1">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
         <child>
           <object class="GtkBox" id="box2">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="orientation">vertical</property>
             <child>
               <object class="GtkBox" id="box3">
-                <property name="visible">True</property>
-                <property name="can_focus">False</property>
                 <property name="orientation">vertical</property>
                 <child>
                   <object class="GtkButton" id="button1">
-                    <property name="visible">True</property>
-                    <property name="can_focus">True</property>
-                    <property name="receives_default">True</property>
+                    <property name="can_focus">1</property>
+                    <property name="receives_default">1</property>
                     <property name="name">ref</property>
                   </object>
                 </child>
@@ -32,18 +23,13 @@
         </child>
         <child>
           <object class="GtkBox" id="box4">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <child>
               <object class="GtkBox" id="box5">
-                <property name="visible">True</property>
-                <property name="can_focus">False</property>
                 <property name="orientation">vertical</property>
                 <child>
                   <object class="GtkButton" id="button2">
-                    <property name="visible">True</property>
-                    <property name="can_focus">True</property>
-                    <property name="receives_default">True</property>
+                    <property name="can_focus">1</property>
+                    <property name="receives_default">1</property>
                     <property name="name">ref</property>
                   </object>
                 </child>

diff --git a/testsuite/reftests/opacity.ui b/testsuite/reftests/opacity.ui
index ff290f1a17a6c51c9be246c86cb8ce776ebc8e13..69159109edaae98ace3e10aaf6b3f53f0aa024d5 100644 (file)
--- a/testsuite/reftests/opacity.ui
+++ b/testsuite/reftests/opacity.ui
@@ -1,31 +1,22 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
-  <!-- interface-requires gtk+ 3.0 -->
   <object class="GtkWindow" id="window1">
-    <property name="can_focus">False</property>
     <property name="type">popup</property>
     <child>
       <object class="GtkBox" id="box1">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
         <property name="name">alpha</property>
         <child>
           <object class="GtkBox" id="box2">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="orientation">vertical</property>
             <property name="name">alpha</property>
             <child>
               <object class="GtkBox" id="box3">
-                <property name="visible">True</property>
-                <property name="can_focus">False</property>
                 <property name="orientation">vertical</property>
-               <property name="name">alpha</property>
+                <property name="name">alpha</property>
                 <child>
                   <object class="GtkButton" id="button1">
-                    <property name="visible">True</property>
-                    <property name="can_focus">True</property>
-                    <property name="receives_default">True</property>
+                    <property name="can_focus">1</property>
+                    <property name="receives_default">1</property>
                   </object>
                 </child>
               </object>
@@ -34,20 +25,15 @@
         </child>
         <child>
           <object class="GtkBox" id="box4">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="name">alpha</property>
             <child>
               <object class="GtkBox" id="box5">
-                <property name="visible">True</property>
-                <property name="can_focus">False</property>
                 <property name="orientation">vertical</property>
-               <property name="name">alpha</property>
+                <property name="name">alpha</property>
                 <child>
                   <object class="GtkButton" id="button2">
-                    <property name="visible">True</property>
-                    <property name="can_focus">True</property>
-                    <property name="receives_default">True</property>
+                    <property name="can_focus">1</property>
+                    <property name="receives_default">1</property>
                   </object>
                 </child>
               </object>

diff --git a/testsuite/reftests/overlay-no-main-widget.ref.ui b/testsuite/reftests/overlay-no-main-widget.ref.ui
index 2e5a5abcd0eaddd9a51941cb5fae4910c518cb45..8327429142a43235426c629d32bfcad5f813834a 100644 (file)
--- a/testsuite/reftests/overlay-no-main-widget.ref.ui
+++ b/testsuite/reftests/overlay-no-main-widget.ref.ui
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
 <interface>
   <requires lib="gtk+" version="3.12"/>
   <object class="GtkWindow" id="window1">

diff --git a/testsuite/reftests/overlay-no-main-widget.ui b/testsuite/reftests/overlay-no-main-widget.ui
index 056026fd58034cdbb6bd01df3a9df730dceac5a1..eaca0f2d0f048141ce673ae34f4339b5ef16627f 100644 (file)
--- a/testsuite/reftests/overlay-no-main-widget.ui
+++ b/testsuite/reftests/overlay-no-main-widget.ui
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
 <interface>
   <requires lib="gtk+" version="3.12"/>
   <object class="GtkWindow" id="window1">

diff --git a/testsuite/reftests/paned-undersized.ref.ui b/testsuite/reftests/paned-undersized.ref.ui
index be87576813336c74add90eb211ceb4a8a09f9005..7a2ea496c20ecdbc005bb89df96379e9cf45477d 100644 (file)
--- a/testsuite/reftests/paned-undersized.ref.ui
+++ b/testsuite/reftests/paned-undersized.ref.ui
@@ -1,13 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
 <interface>
   <object class="GtkWindow" id="window1">
     <property name="type">popup</property>
     <property name="height_request">120</property>
     <child>
       <object class="GtkPaned" id="paned1">
-        <property name="shrink-child2">True</property>
-        <property name="resize-child2">True</property>
-        <property name="shrink-child1">False</property>
-        <property name="resize-child1">False</property>
+        <property name="shrink-child1">0</property>
+        <property name="resize-child1">0</property>
         <property name="can_focus">1</property>
         <property name="orientation">vertical</property>
         <property name="position">10</property>

diff --git a/testsuite/reftests/paned-undersized.ui b/testsuite/reftests/paned-undersized.ui
index 8c16abff942c1b864c33d3de7e8ccdf07b4d66ce..aff21c97e70e791c6590b6fff7700374b7ab892b 100644 (file)
--- a/testsuite/reftests/paned-undersized.ui
+++ b/testsuite/reftests/paned-undersized.ui
@@ -1,13 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
 <interface>
   <object class="GtkWindow" id="window1">
     <property name="height_request">120</property>
     <property name="type">popup</property>
     <child>
       <object class="GtkPaned" id="paned1">
-        <property name="shrink-child2">True</property>
-        <property name="resize-child2">True</property>
-        <property name="shrink-child1">True</property>
-        <property name="resize-child1">False</property>
+        <property name="resize-child1">0</property>
         <property name="can_focus">1</property>
         <property name="orientation">vertical</property>
         <property name="position">10</property>
@@ -17,11 +15,11 @@
               <object class="GtkBox" id="box1">
                 <property name="width_request">50</property>
                 <property name="height_request">50</property>
+                <layout>
+                  <property name="left_attach">0</property>
+                  <property name="top_attach">0</property>
+                </layout>
               </object>
-              <packing>
-                <property name="left_attach">0</property>
-                <property name="top_attach">0</property>
-              </packing>
             </child>
           </object>
         </child>

diff --git a/testsuite/reftests/picture-load-invalid-file.ref.ui b/testsuite/reftests/picture-load-invalid-file.ref.ui
index 3500931a6b1a3fb4294cd87c334c8196e82ec1b4..3ae6f891530e30552fbdf7e19c11c5df0f8f5425 100644 (file)
--- a/testsuite/reftests/picture-load-invalid-file.ref.ui
+++ b/testsuite/reftests/picture-load-invalid-file.ref.ui
@@ -1,11 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
-  <!-- interface-requires gtk+ 3.0 -->
   <object class="GtkWindow" id="window1">
     <property name="type">popup</property>
     <child>
-      <object class="GtkPicture">
-      </object>
+      <object class="GtkPicture"/>
     </child>
   </object>
 </interface>

diff --git a/testsuite/reftests/picture-load-invalid-file.ui b/testsuite/reftests/picture-load-invalid-file.ui
index 8ca26cfacf63a3fdff315e5edb616137d86e2b33..6b74b8a1477a780d67cefadbf21d1c3a05e4ea24 100644 (file)
--- a/testsuite/reftests/picture-load-invalid-file.ui
+++ b/testsuite/reftests/picture-load-invalid-file.ui
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
-  <!-- interface-requires gtk+ 3.0 -->
   <object class="GtkWindow" id="window1">
     <property name="type">popup</property>
     <child>

diff --git a/testsuite/reftests/pseudoclass-on-box.ref.ui b/testsuite/reftests/pseudoclass-on-box.ref.ui
index f74ac3fde705ed0b46c2296ebb4948cf0c77e335..15ebb3d267bae200045e3d4ca5cf3c015063dd9c 100644 (file)
--- a/testsuite/reftests/pseudoclass-on-box.ref.ui
+++ b/testsuite/reftests/pseudoclass-on-box.ref.ui
@@ -1,28 +1,21 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!-- Generated with glade 3.18.1 -->
 <interface>
   <requires lib="gtk+" version="3.12"/>
   <object class="GtkWindow" id="window1">
-    <property name="can_focus">False</property>
     <property name="type">popup</property>
     <child>
       <object class="GtkBox" id="box1">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
         <property name="orientation">vertical</property>
         <child>
           <object class="GtkToggleButton" id="togglebutton1">
-            <property name="visible">True</property>
-            <property name="can_focus">True</property>
-            <property name="receives_default">True</property>
-            <property name="active">True</property>
+            <property name="can_focus">1</property>
+            <property name="receives_default">1</property>
+            <property name="active">1</property>
             <child>
               <object class="GtkLabel" id="label1">
-                <property name="visible">True</property>
-                <property name="can_focus">False</property>
                 <property name="label" translatable="yes">I should be red.</property>
                 <attributes>
-                  <attribute name="foreground" value="#ffff00000000"/>
+                  <attribute name="foreground" value="#ffff00000000"></attribute>
                 </attributes>
               </object>
             </child>

diff --git a/testsuite/reftests/pseudoclass-on-box.ui b/testsuite/reftests/pseudoclass-on-box.ui
index 0a63b5c55592030cac4943f2fec3a3bedbf56162..54255546f5ad08a589fc3eba57224327e01f047e 100644 (file)
--- a/testsuite/reftests/pseudoclass-on-box.ui
+++ b/testsuite/reftests/pseudoclass-on-box.ui
@@ -1,25 +1,18 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!-- Generated with glade 3.18.1 -->
 <interface>
   <requires lib="gtk+" version="3.12"/>
   <object class="GtkWindow" id="window1">
-    <property name="can_focus">False</property>
     <property name="type">popup</property>
     <child>
       <object class="GtkBox" id="box1">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
         <property name="orientation">vertical</property>
         <child>
           <object class="GtkToggleButton" id="togglebutton1">
-            <property name="visible">True</property>
-            <property name="can_focus">True</property>
-            <property name="receives_default">True</property>
-            <property name="active">True</property>
+            <property name="can_focus">1</property>
+            <property name="receives_default">1</property>
+            <property name="active">1</property>
             <child>
               <object class="GtkLabel" id="label1">
-                <property name="visible">True</property>
-                <property name="can_focus">False</property>
                 <property name="label" translatable="yes">I should be red.</property>
               </object>
             </child>

diff --git a/testsuite/reftests/pseudoclass-on-parent.ref.ui b/testsuite/reftests/pseudoclass-on-parent.ref.ui
index 262c5118ddfdd1fa4a53fea13586c352fe59323c..c60fc8c4994c6d1f6ab1377b5f6b21fc703b0d72 100644 (file)
--- a/testsuite/reftests/pseudoclass-on-parent.ref.ui
+++ b/testsuite/reftests/pseudoclass-on-parent.ref.ui
@@ -1,23 +1,18 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!-- Generated with glade 3.18.1 -->
 <interface>
   <requires lib="gtk+" version="3.12"/>
   <object class="GtkWindow" id="window1">
-    <property name="can_focus">False</property>
     <property name="type">popup</property>
     <child>
       <object class="GtkToggleButton" id="togglebutton1">
-        <property name="visible">True</property>
-        <property name="can_focus">True</property>
-        <property name="receives_default">True</property>
-        <property name="active">True</property>
+        <property name="can_focus">1</property>
+        <property name="receives_default">1</property>
+        <property name="active">1</property>
         <child>
           <object class="GtkLabel" id="label1">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="label" translatable="yes">I should be red.</property>
             <attributes>
-              <attribute name="foreground" value="#ffff00000000"/>
+              <attribute name="foreground" value="#ffff00000000"></attribute>
             </attributes>
           </object>
         </child>

diff --git a/testsuite/reftests/pseudoclass-on-parent.ui b/testsuite/reftests/pseudoclass-on-parent.ui
index 9d54b8ef2445e624abb4679ca41cda47eccab3dc..829aecc4ec8ffdf9609fc7200594f7df72e0a636 100644 (file)
--- a/testsuite/reftests/pseudoclass-on-parent.ui
+++ b/testsuite/reftests/pseudoclass-on-parent.ui
@@ -1,20 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!-- Generated with glade 3.18.1 -->
 <interface>
   <requires lib="gtk+" version="3.12"/>
   <object class="GtkWindow" id="window1">
-    <property name="can_focus">False</property>
     <property name="type">popup</property>
     <child>
       <object class="GtkToggleButton" id="togglebutton1">
-        <property name="visible">True</property>
-        <property name="can_focus">True</property>
-        <property name="receives_default">True</property>
-        <property name="active">True</property>
+        <property name="can_focus">1</property>
+        <property name="receives_default">1</property>
+        <property name="active">1</property>
         <child>
           <object class="GtkLabel" id="label1">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="label" translatable="yes">I should be red.</property>
           </object>
         </child>

diff --git a/testsuite/reftests/quit-mnemonic.ref.ui b/testsuite/reftests/quit-mnemonic.ref.ui
index 3c8ff8c36fba39386aecdaa4ffc3caca55f235a9..c5509ae0b403046f82c05b5601036d7997d7e8bd 100644 (file)
--- a/testsuite/reftests/quit-mnemonic.ref.ui
+++ b/testsuite/reftests/quit-mnemonic.ref.ui
@@ -1,17 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
-  <!-- interface-requires gtk+ 3.0 -->
   <object class="GtkWindow" id="window1">
-    <property name="can_focus">False</property>
     <property name="type">popup</property>
     <child>
       <object class="GtkLabel" id="label1">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
         <property name="label" translatable="yes">Quit
 </property>
         <attributes>
-          <attribute name="underline" value="low" start="0" end="1"/>
+          <attribute name="underline" value="low" start="0" end="1"></attribute>
         </attributes>
       </object>
     </child>

diff --git a/testsuite/reftests/quit-mnemonic.ui b/testsuite/reftests/quit-mnemonic.ui
index 128e33a191414a91d080f13016146fadf220946e..b0f30e80a464e63b2a945adfbbbd6eb6405d99e6 100644 (file)
--- a/testsuite/reftests/quit-mnemonic.ui
+++ b/testsuite/reftests/quit-mnemonic.ui
@@ -1,41 +1,33 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
-  <!-- interface-requires gtk+ 3.0 -->
   <object class="GtkWindow" id="window1">
-    <property name="can_focus">False</property>
     <property name="type">popup</property>
     <child>
       <object class="GtkGrid" id="grid1">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
         <child>
           <object class="GtkLabel" id="label1">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="label" translatable="yes">Quit</property>
             <attributes>
-              <attribute name="underline" value="low" start="0" end="1"/>
+              <attribute name="underline" value="low" start="0" end="1"></attribute>
             </attributes>
+            <layout>
+              <property name="left_attach">0</property>
+              <property name="top_attach">0</property>
+              <property name="column-span">1</property>
+              <property name="row-span">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">0</property>
-            <property name="top_attach">0</property>
-            <property name="width">1</property>
-            <property name="height">1</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="label2">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="label" translatable="yes"> </property>
+            <layout>
+              <property name="left_attach">0</property>
+              <property name="top_attach">1</property>
+              <property name="column-span">1</property>
+              <property name="row-span">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">0</property>
-            <property name="top_attach">1</property>
-            <property name="width">1</property>
-            <property name="height">1</property>
-          </packing>
         </child>
       </object>
     </child>

diff --git a/testsuite/reftests/repeating-radial-gradient-at-beginning.ref.ui b/testsuite/reftests/repeating-radial-gradient-at-beginning.ref.ui
index 3f0f3f1d4a010945a5601db19e61d807ef135576..d3f4a731a4df982e046596e2c9822abc697c1c88 100644 (file)
--- a/testsuite/reftests/repeating-radial-gradient-at-beginning.ref.ui
+++ b/testsuite/reftests/repeating-radial-gradient-at-beginning.ref.ui
@@ -1,10 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
-  <!-- interface-requires gtk+ 3.0 -->
   <object class="GtkWindow" id="window1">
     <property name="width_request">64</property>
     <property name="height_request">32</property>
-    <property name="can_focus">False</property>
     <property name="type">popup</property>
     <property name="name">reference</property>
   </object>

diff --git a/testsuite/reftests/repeating-radial-gradient-at-beginning.ui b/testsuite/reftests/repeating-radial-gradient-at-beginning.ui
index a6c83b876aae1bfaade5eca833ea095f29d3090c..b91f9285a6d88f3a42159e1cde9db689b455e390 100644 (file)
--- a/testsuite/reftests/repeating-radial-gradient-at-beginning.ui
+++ b/testsuite/reftests/repeating-radial-gradient-at-beginning.ui
@@ -1,10 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
-  <!-- interface-requires gtk+ 3.0 -->
   <object class="GtkWindow" id="window1">
     <property name="width_request">64</property>
     <property name="height_request">32</property>
-    <property name="can_focus">False</property>
     <property name="type">popup</property>
   </object>
 </interface>

diff --git a/testsuite/reftests/revealer-extra-size.ref.ui b/testsuite/reftests/revealer-extra-size.ref.ui
index 8532cfc787e0ec8c83ab757eed0129fc5b92a746..73ad6e03c6e90c28732281168c02f6fa8ef45d4a 100644 (file)
--- a/testsuite/reftests/revealer-extra-size.ref.ui
+++ b/testsuite/reftests/revealer-extra-size.ref.ui
@@ -1,16 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!-- Generated with glade 3.16.0 on Wed Feb 19 21:14:55 2014 -->
 <interface>
-  <!-- interface-requires gtk+ 3.10 -->
   <object class="GtkWindow" id="window1">
     <property name="width_request">400</property>
     <property name="height_request">300</property>
-    <property name="can_focus">False</property>
     <property name="type">popup</property>
     <child>
       <object class="GtkLabel" id="label1">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
         <property name="label" translatable="yes">Hello World</property>
       </object>
     </child>

diff --git a/testsuite/reftests/revealer-extra-size.ui b/testsuite/reftests/revealer-extra-size.ui
index 2a8e9006f5e7e26289e6cbf0ed647c5cbe7c0270..4b121f219ca12971f6f68176276f55aefa7b8e38 100644 (file)
--- a/testsuite/reftests/revealer-extra-size.ui
+++ b/testsuite/reftests/revealer-extra-size.ui
@@ -1,22 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!-- Generated with glade 3.16.0 on Wed Feb 19 21:14:30 2014 -->
 <interface>
-  <!-- interface-requires gtk+ 3.10 -->
   <object class="GtkWindow" id="window1">
     <property name="width_request">400</property>
     <property name="height_request">300</property>
-    <property name="can_focus">False</property>
     <property name="type">popup</property>
     <child>
       <object class="GtkRevealer" id="revealer1">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
         <property name="transition_type">none</property>
-        <property name="reveal_child">True</property>
+        <property name="reveal_child">1</property>
         <child>
           <object class="GtkLabel" id="label1">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="label" translatable="yes">Hello World</property>
           </object>
         </child>

diff --git a/testsuite/reftests/revealer-wrappable-contents.ref.ui b/testsuite/reftests/revealer-wrappable-contents.ref.ui
index 35542f25b2d684ff49111edfda02a2bb50961539..89b534249debce277fc1789612a30768643b6d5a 100644 (file)
--- a/testsuite/reftests/revealer-wrappable-contents.ref.ui
+++ b/testsuite/reftests/revealer-wrappable-contents.ref.ui
@@ -1,19 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!-- Generated with glade 3.16.0 on Sun Feb 23 14:45:31 2014 -->
 <interface>
-  <!-- interface-requires gtk+ 3.10 -->
   <object class="GtkWindow" id="window1">
-    <property name="can_focus">False</property>
     <property name="type">popup</property>
     <property name="default_width">300</property>
     <property name="default_height">200</property>
     <child>
       <object class="GtkLabel" id="label1">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
         <property name="label" translatable="yes">Hello World</property>
         <property name="valign">start</property>
-        <property name="wrap">True</property>
+        <property name="wrap">1</property>
       </object>
     </child>
   </object>

diff --git a/testsuite/reftests/revealer-wrappable-contents.ui b/testsuite/reftests/revealer-wrappable-contents.ui
index ccfb2c3a8915582d62d3f865b44e30d819cd7464..434d24946764b7ac3182f883d42b0d74548d3995 100644 (file)
--- a/testsuite/reftests/revealer-wrappable-contents.ui
+++ b/testsuite/reftests/revealer-wrappable-contents.ui
@@ -1,25 +1,18 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!-- Generated with glade 3.16.0 on Sun Feb 23 14:45:31 2014 -->
 <interface>
-  <!-- interface-requires gtk+ 3.10 -->
   <object class="GtkWindow" id="window1">
-    <property name="can_focus">False</property>
     <property name="type">popup</property>
     <property name="default_width">300</property>
     <property name="default_height">200</property>
     <child>
       <object class="GtkRevealer" id="revealer1">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
         <property name="valign">start</property>
         <property name="transition_type">none</property>
-        <property name="reveal_child">True</property>
+        <property name="reveal_child">1</property>
         <child>
           <object class="GtkLabel" id="label1">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="label" translatable="yes">Hello World</property>
-            <property name="wrap">True</property>
+            <property name="wrap">1</property>
           </object>
         </child>
       </object>

diff --git a/testsuite/reftests/rotated-layout.ref.ui b/testsuite/reftests/rotated-layout.ref.ui
index 635bafe20186b560ed60ced83ddfe69302306c99..a6ae7ea6f846876c36e0277567f8cefcfbcdb0e5 100644 (file)
--- a/testsuite/reftests/rotated-layout.ref.ui
+++ b/testsuite/reftests/rotated-layout.ref.ui
@@ -1,38 +1,30 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
-  <!-- interface-requires gtk+ 3.0 -->
   <object class="GtkWindow" id="window1">
-    <property name="can_focus">False</property>
     <property name="type">popup</property>
     <child>
       <object class="GtkGrid" id="grid1">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
         <child>
           <object class="GtkLabel" id="label2">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="label" translatable="yes">label</property>
+            <layout>
+              <property name="left_attach">0</property>
+              <property name="top_attach">1</property>
+              <property name="column-span">1</property>
+              <property name="row-span">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">0</property>
-            <property name="top_attach">1</property>
-            <property name="width">1</property>
-            <property name="height">1</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="label1">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="label" translatable="yes">label</property>
+            <layout>
+              <property name="left_attach">1</property>
+              <property name="top_attach">0</property>
+              <property name="column-span">1</property>
+              <property name="row-span">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">1</property>
-            <property name="top_attach">0</property>
-            <property name="width">1</property>
-            <property name="height">1</property>
-          </packing>
         </child>
       </object>
     </child>

diff --git a/testsuite/reftests/rotated-layout.ui b/testsuite/reftests/rotated-layout.ui
index 1dfb8d9b0dbe8c1b1181a388f687e2d1550e6544..ba9603afbe3d500093c96134c0ef1817be98503c 100644 (file)
--- a/testsuite/reftests/rotated-layout.ui
+++ b/testsuite/reftests/rotated-layout.ui
@@ -1,38 +1,30 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
-  <!-- interface-requires gtk+ 3.0 -->
   <object class="GtkWindow" id="window1">
-    <property name="can_focus">False</property>
     <property name="type">popup</property>
     <child>
       <object class="GtkGrid" id="grid1">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
         <child>
           <object class="GtkLabel" id="label1">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="label" translatable="yes">label</property>
+            <layout>
+              <property name="left_attach">1</property>
+              <property name="top_attach">0</property>
+              <property name="column-span">1</property>
+              <property name="row-span">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">1</property>
-            <property name="top_attach">0</property>
-            <property name="width">1</property>
-            <property name="height">1</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="label2">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="label" translatable="yes">label</property>
+            <layout>
+              <property name="left_attach">0</property>
+              <property name="top_attach">1</property>
+              <property name="column-span">1</property>
+              <property name="row-span">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">0</property>
-            <property name="top_attach">1</property>
-            <property name="width">1</property>
-            <property name="height">1</property>
-          </packing>
         </child>
       </object>
     </child>

diff --git a/testsuite/reftests/separator-size.ref.ui b/testsuite/reftests/separator-size.ref.ui
index 1e450d5798affa3f12bfe168aabe6bb97571982a..e3cd91644e02bd9eecacf1c6e810c6decc0c4472 100644 (file)
--- a/testsuite/reftests/separator-size.ref.ui
+++ b/testsuite/reftests/separator-size.ref.ui
@@ -1,114 +1,94 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
-  <!-- interface-requires gtk+ 3.0 -->
   <object class="GtkWindow" id="window1">
-    <property name="can_focus">False</property>
     <property name="type">popup</property>
     <child>
       <object class="GtkGrid" id="grid1">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
         <child>
           <object class="GtkImage" id="image1">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="icon_name">help-about</property>
+            <layout>
+              <property name="left_attach">0</property>
+              <property name="top_attach">2</property>
+              <property name="column-span">1</property>
+              <property name="row-span">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">0</property>
-            <property name="top_attach">2</property>
-            <property name="width">1</property>
-            <property name="height">1</property>
-          </packing>
         </child>
         <child>
           <object class="GtkImage" id="image2">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="icon_name">help-about</property>
+            <layout>
+              <property name="left_attach">2</property>
+              <property name="top_attach">2</property>
+              <property name="column-span">1</property>
+              <property name="row-span">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">2</property>
-            <property name="top_attach">2</property>
-            <property name="width">1</property>
-            <property name="height">1</property>
-          </packing>
         </child>
         <child>
           <object class="GtkImage" id="image3">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="icon_name">help-about</property>
+            <layout>
+              <property name="left_attach">2</property>
+              <property name="top_attach">0</property>
+              <property name="column-span">1</property>
+              <property name="row-span">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">2</property>
-            <property name="top_attach">0</property>
-            <property name="width">1</property>
-            <property name="height">1</property>
-          </packing>
         </child>
         <child>
           <object class="GtkImage" id="image4">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="icon_name">help-about</property>
+            <layout>
+              <property name="left_attach">0</property>
+              <property name="top_attach">0</property>
+              <property name="column-span">1</property>
+              <property name="row-span">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">0</property>
-            <property name="top_attach">0</property>
-            <property name="width">1</property>
-            <property name="height">1</property>
-          </packing>
         </child>
         <child>
           <object class="GtkSeparator" id="separator1">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="orientation">vertical</property>
+            <layout>
+              <property name="left_attach">1</property>
+              <property name="top_attach">0</property>
+              <property name="column-span">1</property>
+              <property name="row-span">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">1</property>
-            <property name="top_attach">0</property>
-            <property name="width">1</property>
-            <property name="height">1</property>
-          </packing>
         </child>
         <child>
           <object class="GtkSeparator" id="separator2">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
+            <layout>
+              <property name="left_attach">0</property>
+              <property name="top_attach">1</property>
+              <property name="column-span">1</property>
+              <property name="row-span">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">0</property>
-            <property name="top_attach">1</property>
-            <property name="width">1</property>
-            <property name="height">1</property>
-          </packing>
         </child>
         <child>
           <object class="GtkSeparator" id="separator3">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
+            <layout>
+              <property name="left_attach">2</property>
+              <property name="top_attach">1</property>
+              <property name="column-span">1</property>
+              <property name="row-span">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">2</property>
-            <property name="top_attach">1</property>
-            <property name="width">1</property>
-            <property name="height">1</property>
-          </packing>
         </child>
         <child>
           <object class="GtkSeparator" id="separator4">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="orientation">vertical</property>
+            <layout>
+              <property name="left_attach">1</property>
+              <property name="top_attach">2</property>
+              <property name="column-span">1</property>
+              <property name="row-span">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">1</property>
-            <property name="top_attach">2</property>
-            <property name="width">1</property>
-            <property name="height">1</property>
-          </packing>
         </child>
       </object>
     </child>

diff --git a/testsuite/reftests/separator-size.ui b/testsuite/reftests/separator-size.ui
index 33df5589a902787e27a1e2bfb49f98704d842fed..8afd8a1b7020cb477cba4962e7f99a39a7e1f4c9 100644 (file)
--- a/testsuite/reftests/separator-size.ui
+++ b/testsuite/reftests/separator-size.ui
@@ -1,162 +1,118 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
-  <!-- interface-requires gtk+ 3.0 -->
   <object class="GtkWindow" id="window1">
-    <property name="can_focus">False</property>
     <property name="type">popup</property>
     <child>
       <object class="GtkGrid" id="grid1">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
         <child>
           <object class="GtkBox" id="box1">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="orientation">vertical</property>
             <child>
               <object class="GtkImage" id="image1">
-                <property name="visible">True</property>
-                <property name="can_focus">False</property>
-                <property name="hexpand">True</property>
-                <property name="vexpand">True</property>
+                <property name="hexpand">1</property>
+                <property name="vexpand">1</property>
                 <property name="icon_name">help-about</property>
               </object>
             </child>
             <child>
-              <object class="GtkSeparator" id="separator1">
-                <property name="visible">True</property>
-                <property name="can_focus">False</property>
-              </object>
+              <object class="GtkSeparator" id="separator1"/>
             </child>
+            <layout>
+              <property name="left_attach">0</property>
+              <property name="top_attach">0</property>
+              <property name="column-span">1</property>
+              <property name="row-span">2</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">0</property>
-            <property name="top_attach">0</property>
-            <property name="width">1</property>
-            <property name="height">2</property>
-          </packing>
         </child>
         <child>
           <object class="GtkBox" id="box2">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <child>
               <object class="GtkImage" id="image2">
-                <property name="visible">True</property>
-                <property name="can_focus">False</property>
-                <property name="hexpand">True</property>
-                <property name="vexpand">True</property>
+                <property name="hexpand">1</property>
+                <property name="vexpand">1</property>
                 <property name="icon_name">help-about</property>
               </object>
             </child>
             <child>
               <object class="GtkSeparator" id="separator2">
-                <property name="visible">True</property>
-                <property name="can_focus">False</property>
                 <property name="orientation">vertical</property>
               </object>
             </child>
+            <layout>
+              <property name="left_attach">0</property>
+              <property name="top_attach">2</property>
+              <property name="column-span">2</property>
+              <property name="row-span">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">0</property>
-            <property name="top_attach">2</property>
-            <property name="width">2</property>
-            <property name="height">1</property>
-          </packing>
         </child>
         <child>
           <object class="GtkBox" id="box3">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="orientation">vertical</property>
             <child>
-              <object class="GtkSeparator" id="separator3">
-                <property name="visible">True</property>
-                <property name="can_focus">False</property>
-              </object>
+              <object class="GtkSeparator" id="separator3"/>
             </child>
             <child>
               <object class="GtkImage" id="image3">
-                <property name="visible">True</property>
-                <property name="can_focus">False</property>
-                <property name="hexpand">True</property>
-                <property name="vexpand">True</property>
+                <property name="hexpand">1</property>
+                <property name="vexpand">1</property>
                 <property name="icon_name">help-about</property>
               </object>
             </child>
+            <layout>
+              <property name="left_attach">2</property>
+              <property name="top_attach">1</property>
+              <property name="column-span">1</property>
+              <property name="row-span">2</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">2</property>
-            <property name="top_attach">1</property>
-            <property name="width">1</property>
-            <property name="height">2</property>
-          </packing>
         </child>
-
-        <!-- BEGIN REMOVE WHEN GRID FIXED -->
-
         <child>
           <object class="GtkNotebook" id="notebook1">
-            <property name="visible">True</property>
-            <property name="can_focus">True</property>
-            <property name="show_tabs">False</property>
-            <property name="show_border">False</property>
+            <property name="can_focus">1</property>
+            <property name="show_tabs">0</property>
+            <property name="show_border">0</property>
             <child>
               <object class="GtkBox" id="box5">
-                <property name="visible">True</property>
-                <property name="can_focus">False</property>
                 <property name="orientation">vertical</property>
               </object>
             </child>
             <child>
-              <object class="GtkSeparator" id="separator5">
-                <property name="visible">True</property>
-                <property name="can_focus">False</property>
-              </object>
+              <object class="GtkSeparator" id="separator5"/>
             </child>
             <child>
               <object class="GtkSeparator" id="separator6">
-                <property name="visible">True</property>
-                <property name="can_focus">False</property>
                 <property name="orientation">vertical</property>
               </object>
             </child>
+            <layout>
+              <property name="left_attach">1</property>
+              <property name="top_attach">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">1</property>
-            <property name="top_attach">1</property>
-          </packing>
         </child>
-
-        <!-- END REMOVE WHEN GRID FIXED -->
-
         <child>
           <object class="GtkBox" id="box4">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <child>
               <object class="GtkSeparator" id="separator4">
-                <property name="visible">True</property>
-                <property name="can_focus">False</property>
                 <property name="orientation">vertical</property>
               </object>
             </child>
             <child>
               <object class="GtkImage" id="image4">
-                <property name="visible">True</property>
-                <property name="can_focus">False</property>
-                <property name="hexpand">True</property>
-                <property name="vexpand">True</property>
+                <property name="hexpand">1</property>
+                <property name="vexpand">1</property>
                 <property name="icon_name">help-about</property>
               </object>
             </child>
+            <layout>
+              <property name="left_attach">1</property>
+              <property name="top_attach">0</property>
+              <property name="column-span">2</property>
+              <property name="row-span">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">1</property>
-            <property name="top_attach">0</property>
-            <property name="width">2</property>
-            <property name="height">1</property>
-          </packing>
         </child>
       </object>
     </child>

diff --git a/testsuite/reftests/set-default-direction.ref.ui b/testsuite/reftests/set-default-direction.ref.ui
index c9fe35a46395ef79c4e0331542fb6c236d2c2cf5..a64eebe5f3c6572a472e60f4245e94fbbd233609 100644 (file)
--- a/testsuite/reftests/set-default-direction.ref.ui
+++ b/testsuite/reftests/set-default-direction.ref.ui
@@ -1,17 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!-- Generated with glade 3.18.1 -->
 <interface>
   <requires lib="gtk+" version="3.12"/>
   <object class="GtkWindow" id="window1">
-    <property name="can_focus">False</property>
     <property name="type">popup</property>
     <signal name="realize" handler="reftest:switch_default_direction" after="yes" swapped="no"/>
     <signal name="map" handler="reftest:swap_child" after="yes" swapped="no"/>
     <signal name="destroy" handler="reftest:switch_default_direction" after="yes" swapped="no"/>
     <child>
       <object class="GtkImage" id="image1">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
         <property name="icon_name">go-next</property>
       </object>
     </child>

diff --git a/testsuite/reftests/set-default-direction.ui b/testsuite/reftests/set-default-direction.ui
index 33cf5ca7818e3e647d5cc7d13aac0ee996a7c14f..6f379a1f7891ec4e84332089ce9642acb60a15ab 100644 (file)
--- a/testsuite/reftests/set-default-direction.ui
+++ b/testsuite/reftests/set-default-direction.ui
@@ -1,16 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!-- Generated with glade 3.18.1 -->
 <interface>
   <requires lib="gtk+" version="3.12"/>
   <object class="GtkWindow" id="window1">
-    <property name="can_focus">False</property>
     <property name="type">popup</property>
     <signal name="map" handler="reftest:switch_default_direction" swapped="no"/>
     <signal name="destroy" handler="reftest:switch_default_direction" swapped="no"/>
     <child>
       <object class="GtkImage" id="image1">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
         <property name="icon_name">go-next</property>
       </object>
     </child>

diff --git a/testsuite/reftests/shadow-clip-rounding.ref.ui b/testsuite/reftests/shadow-clip-rounding.ref.ui
index 31f744d3a93c5ce3c4d419810101901061ac2220..97be53210ba4c0a5f68e12c34268893a25218baf 100644 (file)
--- a/testsuite/reftests/shadow-clip-rounding.ref.ui
+++ b/testsuite/reftests/shadow-clip-rounding.ref.ui
@@ -1,16 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!-- Generated with glade 3.18.1 -->
 <interface>
   <requires lib="gtk+" version="3.12"/>
   <object class="GtkWindow" id="window1">
     <property name="width_request">100</property>
     <property name="height_request">100</property>
-    <property name="can_focus">False</property>
     <property name="type">popup</property>
     <child>
       <object class="GtkLabel" id="label1">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
         <property name="halign">center</property>
         <property name="valign">center</property>
         <property name="label" translatable="yes">X</property>

diff --git a/testsuite/reftests/shadow-clip-rounding.ui b/testsuite/reftests/shadow-clip-rounding.ui
index 03741621b7a3c6c1a217aa1e61c0215ab63ea606..7672f7db14d9ac8cf08ca9c67f5b67f825b76780 100644 (file)
--- a/testsuite/reftests/shadow-clip-rounding.ui
+++ b/testsuite/reftests/shadow-clip-rounding.ui
@@ -1,16 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!-- Generated with glade 3.18.1 -->
 <interface>
   <requires lib="gtk+" version="3.12"/>
   <object class="GtkWindow" id="window1">
     <property name="width_request">100</property>
     <property name="height_request">100</property>
-    <property name="can_focus">False</property>
     <property name="type">popup</property>
     <child>
       <object class="GtkLabel" id="label1">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
         <property name="halign">center</property>
         <property name="valign">center</property>
         <property name="label" translatable="yes">X</property>

diff --git a/testsuite/reftests/shorthand-entry-border.ref.ui b/testsuite/reftests/shorthand-entry-border.ref.ui
index ea181fe669c9a6fa9f215cf50536e05e06cde7bc..bd5c6d34a172996a282afa655f2c23fe33377b0b 100644 (file)
--- a/testsuite/reftests/shorthand-entry-border.ref.ui
+++ b/testsuite/reftests/shorthand-entry-border.ref.ui
@@ -1,13 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
-  <!-- interface-requires gtk+ 3.0 -->
   <object class="GtkWindow" id="window1">
-    <property name="can_focus">False</property>
     <property name="type">popup</property>
     <child>
       <object class="GtkEntry" id="entry1">
-        <property name="visible">True</property>
-        <property name="can_focus">True</property>
+        <property name="can_focus">1</property>
         <property name="name">reference</property>
       </object>
     </child>

diff --git a/testsuite/reftests/shorthand-entry-border.ui b/testsuite/reftests/shorthand-entry-border.ui
index 91ce522a9866216eef5292c93015e3aef58208a3..6c5efd2a3e52336ab0f6688f9f786f019e0adb48 100644 (file)
--- a/testsuite/reftests/shorthand-entry-border.ui
+++ b/testsuite/reftests/shorthand-entry-border.ui
@@ -1,13 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
-  <!-- interface-requires gtk+ 3.0 -->
   <object class="GtkWindow" id="window1">
-    <property name="can_focus">False</property>
     <property name="type">popup</property>
     <child>
       <object class="GtkEntry" id="entry1">
-        <property name="visible">True</property>
-        <property name="can_focus">True</property>
+        <property name="can_focus">1</property>
       </object>
     </child>
   </object>

diff --git a/testsuite/reftests/sibling-pseudoclasses.ref.ui b/testsuite/reftests/sibling-pseudoclasses.ref.ui
index 138c9eeb02ce746a7eaa913884aa05fed2d4c87c..cdf575d44ab61651b59552215c364342c4348995 100644 (file)
--- a/testsuite/reftests/sibling-pseudoclasses.ref.ui
+++ b/testsuite/reftests/sibling-pseudoclasses.ref.ui
@@ -1,20 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!-- Generated with glade 3.18.1 -->
 <interface>
   <requires lib="gtk+" version="3.12"/>
   <object class="GtkWindow" id="window1">
-    <property name="can_focus">False</property>
     <child>
       <object class="GtkBox" id="box1">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
         <property name="orientation">vertical</property>
         <child>
           <object class="GtkToggleButton" id="togglebutton1">
-            <property name="visible">True</property>
-            <property name="can_focus">True</property>
-            <property name="receives_default">True</property>
-            <property name="active">True</property>
+            <property name="can_focus">1</property>
+            <property name="receives_default">1</property>
+            <property name="active">1</property>
             <child>
               <placeholder/>
             </child>
@@ -22,11 +17,9 @@
         </child>
         <child>
           <object class="GtkLabel" id="label1">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
-            <property name="label" translatable="yes">I'm tomato.</property>
+            <property name="label" translatable="yes">I&apos;m tomato.</property>
             <attributes>
-              <attribute name="foreground" value="#ffff63634747"/>
+              <attribute name="foreground" value="#ffff63634747"></attribute>
             </attributes>
           </object>
         </child>

diff --git a/testsuite/reftests/sibling-pseudoclasses.ui b/testsuite/reftests/sibling-pseudoclasses.ui
index d93ff4da9d196c53c2a5efa6cf8e27595a806337..45859193f0b5649003fae939ffdcaf1b031feab0 100644 (file)
--- a/testsuite/reftests/sibling-pseudoclasses.ui
+++ b/testsuite/reftests/sibling-pseudoclasses.ui
@@ -1,20 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!-- Generated with glade 3.18.1 -->
 <interface>
   <requires lib="gtk+" version="3.12"/>
   <object class="GtkWindow" id="window1">
-    <property name="can_focus">False</property>
     <child>
       <object class="GtkBox" id="box1">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
         <property name="orientation">vertical</property>
         <child>
           <object class="GtkToggleButton" id="togglebutton1">
-            <property name="visible">True</property>
-            <property name="can_focus">True</property>
-            <property name="receives_default">True</property>
-            <property name="active">True</property>
+            <property name="can_focus">1</property>
+            <property name="receives_default">1</property>
+            <property name="active">1</property>
             <child>
               <placeholder/>
             </child>
@@ -22,9 +17,7 @@
         </child>
         <child>
           <object class="GtkLabel" id="label1">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
-            <property name="label" translatable="yes">I'm tomato.</property>
+            <property name="label" translatable="yes">I&apos;m tomato.</property>
           </object>
         </child>
       </object>

diff --git a/testsuite/reftests/simple.ref.ui b/testsuite/reftests/simple.ref.ui
index c6c3361585a1ea49ece6de3b9840393654e5493c..34efec74e879ae30ef706adfed7f9de5f1521bd9 100644 (file)
--- a/testsuite/reftests/simple.ref.ui
+++ b/testsuite/reftests/simple.ref.ui
@@ -1,15 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
-  <!-- interface-requires gtk+ 3.0 -->
   <object class="GtkWindow" id="window1">
     <property name="width_request">10</property>
     <property name="height_request">10</property>
-    <property name="can_focus">False</property>
     <property name="type">popup</property>
     <child>
       <object class="GtkBox" id="box1">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
         <child>
           <placeholder/>
         </child>

diff --git a/testsuite/reftests/simple.ui b/testsuite/reftests/simple.ui
index c6c3361585a1ea49ece6de3b9840393654e5493c..34efec74e879ae30ef706adfed7f9de5f1521bd9 100644 (file)
--- a/testsuite/reftests/simple.ui
+++ b/testsuite/reftests/simple.ui
@@ -1,15 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
-  <!-- interface-requires gtk+ 3.0 -->
   <object class="GtkWindow" id="window1">
     <property name="width_request">10</property>
     <property name="height_request">10</property>
-    <property name="can_focus">False</property>
     <property name="type">popup</property>
     <child>
       <object class="GtkBox" id="box1">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
         <child>
           <placeholder/>
         </child>

diff --git a/testsuite/reftests/sizegroups-basics.ref.ui b/testsuite/reftests/sizegroups-basics.ref.ui
index 15c7a01dd38477d32541b2467c12b3c61c0f83ba..2dfae317130cf414d65de2c617f1bd79653219b9 100644 (file)
--- a/testsuite/reftests/sizegroups-basics.ref.ui
+++ b/testsuite/reftests/sizegroups-basics.ref.ui
@@ -1,54 +1,45 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
-  <!-- interface-requires gtk+ 3.0 -->
   <object class="GtkWindow" id="window1">
-    <property name="can_focus">False</property>
     <property name="type">popup</property>
-      <child>
-        <object class="GtkGrid" id="grid1">
-          <property name="visible">True</property>
-          <property name="can_focus">False</property>
-          <property name="orientation">vertical</property>
-          <child>
-            <object class="GtkGrid" id="grid2">
-              <property name="visible">True</property>
-              <property name="can_focus">False</property>
-              <property name="orientation">vertical</property>
-              <property name="row-homogeneous">True</property>
-              <property name="column-homogeneous">True</property>
-              <child>
-                <object class="GtkLabel" id="label1">
-                  <property name="visible">True</property>
-                </object>
-                <packing>
+    <child>
+      <object class="GtkGrid" id="grid1">
+        <property name="orientation">vertical</property>
+        <child>
+          <object class="GtkGrid" id="grid2">
+            <property name="orientation">vertical</property>
+            <property name="row-homogeneous">1</property>
+            <property name="column-homogeneous">1</property>
+            <child>
+              <object class="GtkLabel" id="label1">
+                <layout>
                   <property name="top-attach">0</property>
                   <property name="left-attach">0</property>
-                </packing>
-              </child>
-              <child>
-                <object class="GtkLabel" id="label2">
-                  <property name="visible">True</property>
-                  <property name="label" translatable="yes">medium</property>
-                </object>
-                <packing>
+                </layout>
+              </object>
+            </child>
+            <child>
+              <object class="GtkLabel" id="label2">
+                <property name="label" translatable="yes">medium</property>
+                <layout>
                   <property name="top-attach">1</property>
                   <property name="left-attach">1</property>
-                </packing>
-              </child>
-              <child>
-                <object class="GtkLabel" id="label3">
-                  <property name="visible">True</property>
-                  <property name="label" translatable="yes">wrap this very long text please or I'll need to write even more</property>
-                  <property name="wrap">True</property>
-                </object>
-                <packing>
+                </layout>
+              </object>
+            </child>
+            <child>
+              <object class="GtkLabel" id="label3">
+                <property name="label" translatable="yes">wrap this very long text please or I&apos;ll need to write even more</property>
+                <property name="wrap">1</property>
+                <layout>
                   <property name="top-attach">2</property>
                   <property name="left-attach">2</property>
-                </packing>
-              </child>
-            </object>
-          </child>
-        </object>
+                </layout>
+              </object>
+            </child>
+          </object>
+        </child>
+      </object>
     </child>
   </object>
 </interface>

diff --git a/testsuite/reftests/sizegroups-basics.ui b/testsuite/reftests/sizegroups-basics.ui
index 696802cda5a31cbece3d897f38e8b367f4f801fd..ae2239b42665cc4761a2ad746c7e7682619ee390 100644 (file)
--- a/testsuite/reftests/sizegroups-basics.ui
+++ b/testsuite/reftests/sizegroups-basics.ui
@@ -1,60 +1,51 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
-  <!-- interface-requires gtk+ 3.0 -->
   <object class="GtkWindow" id="window1">
-    <property name="can_focus">False</property>
     <property name="type">popup</property>
-      <child>
-        <object class="GtkGrid" id="grid1">
-          <property name="visible">True</property>
-          <property name="can_focus">False</property>
-          <property name="orientation">vertical</property>
-          <child>
-            <object class="GtkGrid" id="grid2">
-              <property name="visible">True</property>
-              <property name="can_focus">False</property>
-              <property name="orientation">vertical</property>
-              <child>
-                <object class="GtkLabel" id="label1">
-                  <property name="visible">True</property>
-                </object>
-                <packing>
+    <child>
+      <object class="GtkGrid" id="grid1">
+        <property name="orientation">vertical</property>
+        <child>
+          <object class="GtkGrid" id="grid2">
+            <property name="orientation">vertical</property>
+            <child>
+              <object class="GtkLabel" id="label1">
+                <layout>
                   <property name="top-attach">0</property>
                   <property name="left-attach">0</property>
-                </packing>
-              </child>
-              <child>
-                <object class="GtkLabel" id="label2">
-                  <property name="visible">True</property>
-                  <property name="label" translatable="yes">medium</property>
-                </object>
-                <packing>
+                </layout>
+              </object>
+            </child>
+            <child>
+              <object class="GtkLabel" id="label2">
+                <property name="label" translatable="yes">medium</property>
+                <layout>
                   <property name="top-attach">1</property>
                   <property name="left-attach">1</property>
-                </packing>
-              </child>
-              <child>
-                <object class="GtkLabel" id="label3">
-                  <property name="visible">True</property>
-                  <property name="label" translatable="yes">wrap this very long text please or I'll need to write even more</property>
-                  <property name="wrap">True</property>
-                </object>
-                <packing>
+                </layout>
+              </object>
+            </child>
+            <child>
+              <object class="GtkLabel" id="label3">
+                <property name="label" translatable="yes">wrap this very long text please or I&apos;ll need to write even more</property>
+                <property name="wrap">1</property>
+                <layout>
                   <property name="top-attach">2</property>
                   <property name="left-attach">2</property>
-                </packing>
-              </child>
-            </object>
-          </child>
-        </object>
+                </layout>
+              </object>
+            </child>
+          </object>
+        </child>
+      </object>
     </child>
   </object>
   <object class="GtkSizeGroup" id="sizegroup1">
     <property name="mode">both</property>
     <widgets>
-      <widget name="label1" />
-      <widget name="label2" />
-      <widget name="label3" />
+      <widget name="label1"/>
+      <widget name="label2"/>
+      <widget name="label3"/>
     </widgets>
   </object>
 </interface>

diff --git a/testsuite/reftests/sizegroups-evolution-identity-page.ref.ui b/testsuite/reftests/sizegroups-evolution-identity-page.ref.ui
index f2bbe6b7b4f1cd1c6d1f84168189b876df1ae285..4f03d91f24ed5424c55dafe49f7079ccc564f14b 100644 (file)
--- a/testsuite/reftests/sizegroups-evolution-identity-page.ref.ui
+++ b/testsuite/reftests/sizegroups-evolution-identity-page.ref.ui
@@ -1,242 +1,213 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
-  <!-- interface-requires gtk+ 3.0 -->
   <object class="GtkWindow" id="window1">
-    <property name="can_focus">False</property>
     <property name="type">popup</property>
     <child>
       <object class="GtkGrid" id="grid1">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
         <property name="row_spacing">6</property>
         <property name="column_spacing">6</property>
         <child>
           <object class="GtkLabel" id="label1">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="xalign">0</property>
-            <property name="label" translatable="yes">Please enter your name and email address below. The "optional" fields below do not need to be filled in, unless you wish to include this information in email you send.</property>
-            <property name="wrap">True</property>
+            <property name="label" translatable="yes">Please enter your name and email address below. The &quot;optional&quot; fields below do not need to be filled in, unless you wish to include this information in email you send.</property>
+            <property name="wrap">1</property>
+            <layout>
+              <property name="left_attach">0</property>
+              <property name="top_attach">0</property>
+              <property name="column-span">2</property>
+              <property name="row-span">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">0</property>
-            <property name="top_attach">0</property>
-            <property name="width">2</property>
-            <property name="height">1</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="label2">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="xalign">0</property>
             <property name="label" translatable="yes">&lt;b&gt;Account Information&lt;/b&gt;</property>
-            <property name="use_markup">True</property>
+            <property name="use_markup">1</property>
+            <layout>
+              <property name="left_attach">0</property>
+              <property name="top_attach">1</property>
+              <property name="column-span">2</property>
+              <property name="row-span">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">0</property>
-            <property name="top_attach">1</property>
-            <property name="width">2</property>
-            <property name="height">1</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="label3">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="margin_start">12</property>
             <property name="xalign">0</property>
             <property name="label" translatable="yes">Type the name by which you would like to refer to this account.
-For example, "Work" or "Personal".</property>
+For example, &quot;Work&quot; or &quot;Personal&quot;.</property>
+            <layout>
+              <property name="left_attach">0</property>
+              <property name="top_attach">2</property>
+              <property name="column-span">2</property>
+              <property name="row-span">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">0</property>
-            <property name="top_attach">2</property>
-            <property name="width">2</property>
-            <property name="height">1</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="label4">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="margin_start">12</property>
             <property name="xalign">1</property>
             <property name="label" translatable="yes">_Name:</property>
-            <property name="use_underline">True</property>
+            <property name="use_underline">1</property>
             <property name="mnemonic_widget">entry1</property>
+            <layout>
+              <property name="left_attach">0</property>
+              <property name="top_attach">3</property>
+              <property name="column-span">1</property>
+              <property name="row-span">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">0</property>
-            <property name="top_attach">3</property>
-            <property name="width">1</property>
-            <property name="height">1</property>
-          </packing>
         </child>
         <child>
           <object class="GtkEntry" id="entry1">
-            <property name="visible">True</property>
-            <property name="can_focus">True</property>
-            <property name="hexpand">True</property>
+            <property name="can_focus">1</property>
+            <property name="hexpand">1</property>
             <property name="invisible_char">●</property>
+            <layout>
+              <property name="left_attach">1</property>
+              <property name="top_attach">3</property>
+              <property name="column-span">1</property>
+              <property name="row-span">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">1</property>
-            <property name="top_attach">3</property>
-            <property name="width">1</property>
-            <property name="height">1</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="label5">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="xalign">0</property>
             <property name="label" translatable="yes">&lt;b&gt;Required Information&lt;/b&gt;</property>
-            <property name="use_markup">True</property>
+            <property name="use_markup">1</property>
+            <layout>
+              <property name="left_attach">0</property>
+              <property name="top_attach">4</property>
+              <property name="column-span">2</property>
+              <property name="row-span">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">0</property>
-            <property name="top_attach">4</property>
-            <property name="width">2</property>
-            <property name="height">1</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="label6">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="margin_start">12</property>
             <property name="xalign">1</property>
             <property name="label" translatable="yes">Full Nam_e:</property>
-            <property name="use_underline">True</property>
+            <property name="use_underline">1</property>
             <property name="mnemonic_widget">entry2</property>
+            <layout>
+              <property name="left_attach">0</property>
+              <property name="top_attach">5</property>
+              <property name="column-span">1</property>
+              <property name="row-span">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">0</property>
-            <property name="top_attach">5</property>
-            <property name="width">1</property>
-            <property name="height">1</property>
-          </packing>
         </child>
         <child>
           <object class="GtkEntry" id="entry2">
-            <property name="visible">True</property>
-            <property name="can_focus">True</property>
-            <property name="hexpand">True</property>
+            <property name="can_focus">1</property>
+            <property name="hexpand">1</property>
             <property name="invisible_char">●</property>
+            <layout>
+              <property name="left_attach">1</property>
+              <property name="top_attach">5</property>
+              <property name="column-span">1</property>
+              <property name="row-span">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">1</property>
-            <property name="top_attach">5</property>
-            <property name="width">1</property>
-            <property name="height">1</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="label7">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="margin_start">12</property>
             <property name="label" translatable="yes">Email _Address:</property>
-            <property name="use_underline">True</property>
+            <property name="use_underline">1</property>
+            <layout>
+              <property name="left_attach">0</property>
+              <property name="top_attach">6</property>
+              <property name="column-span">1</property>
+              <property name="row-span">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">0</property>
-            <property name="top_attach">6</property>
-            <property name="width">1</property>
-            <property name="height">1</property>
-          </packing>
         </child>
         <child>
           <object class="GtkEntry" id="entry3">
-            <property name="visible">True</property>
-            <property name="can_focus">True</property>
-            <property name="hexpand">True</property>
+            <property name="can_focus">1</property>
+            <property name="hexpand">1</property>
             <property name="invisible_char">●</property>
+            <layout>
+              <property name="left_attach">1</property>
+              <property name="top_attach">6</property>
+              <property name="column-span">1</property>
+              <property name="row-span">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">1</property>
-            <property name="top_attach">6</property>
-            <property name="width">1</property>
-            <property name="height">1</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="label8">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="xalign">0</property>
             <property name="label" translatable="yes">&lt;b&gt;Optional Information&lt;/b&gt;</property>
-            <property name="use_markup">True</property>
+            <property name="use_markup">1</property>
+            <layout>
+              <property name="left_attach">0</property>
+              <property name="top_attach">7</property>
+              <property name="column-span">2</property>
+              <property name="row-span">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">0</property>
-            <property name="top_attach">7</property>
-            <property name="width">2</property>
-            <property name="height">1</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="label9">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="margin_start">12</property>
             <property name="xalign">1</property>
             <property name="label" translatable="yes">Re_ply-To:</property>
-            <property name="use_underline">True</property>
+            <property name="use_underline">1</property>
             <property name="mnemonic_widget">entry4</property>
+            <layout>
+              <property name="left_attach">0</property>
+              <property name="top_attach">8</property>
+              <property name="column-span">1</property>
+              <property name="row-span">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">0</property>
-            <property name="top_attach">8</property>
-            <property name="width">1</property>
-            <property name="height">1</property>
-          </packing>
         </child>
         <child>
           <object class="GtkEntry" id="entry4">
-            <property name="visible">True</property>
-            <property name="can_focus">True</property>
-            <property name="hexpand">True</property>
+            <property name="can_focus">1</property>
+            <property name="hexpand">1</property>
             <property name="invisible_char">●</property>
+            <layout>
+              <property name="left_attach">1</property>
+              <property name="top_attach">8</property>
+              <property name="column-span">1</property>
+              <property name="row-span">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">1</property>
-            <property name="top_attach">8</property>
-            <property name="width">1</property>
-            <property name="height">1</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="label10">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="margin_start">12</property>
             <property name="xalign">1</property>
             <property name="label" translatable="yes">Or_ganization:</property>
-            <property name="use_underline">True</property>
+            <property name="use_underline">1</property>
             <property name="mnemonic_widget">entry5</property>
+            <layout>
+              <property name="left_attach">0</property>
+              <property name="top_attach">9</property>
+              <property name="column-span">1</property>
+              <property name="row-span">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">0</property>
-            <property name="top_attach">9</property>
-            <property name="width">1</property>
-            <property name="height">1</property>
-          </packing>
         </child>
         <child>
           <object class="GtkEntry" id="entry5">
-            <property name="visible">True</property>
-            <property name="can_focus">True</property>
+            <property name="can_focus">1</property>
             <property name="invisible_char">●</property>
+            <layout>
+              <property name="left_attach">1</property>
+              <property name="top_attach">9</property>
+              <property name="column-span">1</property>
+              <property name="row-span">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">1</property>
-            <property name="top_attach">9</property>
-            <property name="width">1</property>
-            <property name="height">1</property>
-          </packing>
         </child>
       </object>
     </child>

diff --git a/testsuite/reftests/sizegroups-evolution-identity-page.ui b/testsuite/reftests/sizegroups-evolution-identity-page.ui
index 23b2e4783fe7ab6bd4f31e535fa44fdf24b5f662..f1525ab8826f2fc430081d97be3ded6ab7eeda86 100644 (file)
--- a/testsuite/reftests/sizegroups-evolution-identity-page.ui
+++ b/testsuite/reftests/sizegroups-evolution-identity-page.ui
@@ -1,258 +1,223 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
-  <!-- interface-requires gtk+ 3.0 -->
   <object class="GtkWindow" id="window1">
-    <property name="can_focus">False</property>
     <property name="type">popup</property>
     <child>
       <object class="GtkBox" id="box1">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
         <property name="orientation">vertical</property>
         <property name="spacing">6</property>
         <child>
           <object class="GtkLabel" id="label1">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="xalign">0</property>
-            <property name="label" translatable="yes">Please enter your name and email address below. The "optional" fields below do not need to be filled in, unless you wish to include this information in email you send.</property>
-            <property name="wrap">True</property>
+            <property name="label" translatable="yes">Please enter your name and email address below. The &quot;optional&quot; fields below do not need to be filled in, unless you wish to include this information in email you send.</property>
+            <property name="wrap">1</property>
           </object>
         </child>
         <child>
           <object class="GtkGrid" id="grid1">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="row_spacing">6</property>
             <property name="column_spacing">6</property>
             <child>
               <object class="GtkLabel" id="label2">
-                <property name="visible">True</property>
-                <property name="can_focus">False</property>
                 <property name="xalign">0</property>
                 <property name="label" translatable="yes">&lt;b&gt;Account Information&lt;/b&gt;</property>
-                <property name="use_markup">True</property>
+                <property name="use_markup">1</property>
+                <layout>
+                  <property name="left_attach">0</property>
+                  <property name="top_attach">0</property>
+                  <property name="column-span">2</property>
+                  <property name="row-span">1</property>
+                </layout>
               </object>
-              <packing>
-                <property name="left_attach">0</property>
-                <property name="top_attach">0</property>
-                <property name="width">2</property>
-                <property name="height">1</property>
-              </packing>
             </child>
             <child>
               <object class="GtkLabel" id="label3">
-                <property name="visible">True</property>
-                <property name="can_focus">False</property>
                 <property name="margin_start">12</property>
                 <property name="xalign">0</property>
                 <property name="label" translatable="yes">Type the name by which you would like to refer to this account.
-For example, "Work" or "Personal".</property>
+For example, &quot;Work&quot; or &quot;Personal&quot;.</property>
+                <layout>
+                  <property name="left_attach">0</property>
+                  <property name="top_attach">1</property>
+                  <property name="column-span">2</property>
+                  <property name="row-span">1</property>
+                </layout>
               </object>
-              <packing>
-                <property name="left_attach">0</property>
-                <property name="top_attach">1</property>
-                <property name="width">2</property>
-                <property name="height">1</property>
-              </packing>
             </child>
             <child>
               <object class="GtkLabel" id="label4">
-                <property name="visible">True</property>
-                <property name="can_focus">False</property>
                 <property name="margin_start">12</property>
                 <property name="xalign">1</property>
                 <property name="label" translatable="yes">_Name:</property>
-                <property name="use_underline">True</property>
+                <property name="use_underline">1</property>
                 <property name="mnemonic_widget">entry1</property>
+                <layout>
+                  <property name="left_attach">0</property>
+                  <property name="top_attach">2</property>
+                  <property name="column-span">1</property>
+                  <property name="row-span">1</property>
+                </layout>
               </object>
-              <packing>
-                <property name="left_attach">0</property>
-                <property name="top_attach">2</property>
-                <property name="width">1</property>
-                <property name="height">1</property>
-              </packing>
             </child>
             <child>
               <object class="GtkEntry" id="entry1">
-                <property name="visible">True</property>
-                <property name="can_focus">True</property>
-                <property name="hexpand">True</property>
+                <property name="can_focus">1</property>
+                <property name="hexpand">1</property>
                 <property name="invisible_char">●</property>
+                <layout>
+                  <property name="left_attach">1</property>
+                  <property name="top_attach">2</property>
+                  <property name="column-span">1</property>
+                  <property name="row-span">1</property>
+                </layout>
               </object>
-              <packing>
-                <property name="left_attach">1</property>
-                <property name="top_attach">2</property>
-                <property name="width">1</property>
-                <property name="height">1</property>
-              </packing>
             </child>
           </object>
         </child>
         <child>
           <object class="GtkGrid" id="grid2">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="row_spacing">6</property>
             <property name="column_spacing">6</property>
             <child>
               <object class="GtkLabel" id="label5">
-                <property name="visible">True</property>
-                <property name="can_focus">False</property>
                 <property name="xalign">0</property>
                 <property name="label" translatable="yes">&lt;b&gt;Required Information&lt;/b&gt;</property>
-                <property name="use_markup">True</property>
+                <property name="use_markup">1</property>
+                <layout>
+                  <property name="left_attach">0</property>
+                  <property name="top_attach">0</property>
+                  <property name="column-span">2</property>
+                  <property name="row-span">1</property>
+                </layout>
               </object>
-              <packing>
-                <property name="left_attach">0</property>
-                <property name="top_attach">0</property>
-                <property name="width">2</property>
-                <property name="height">1</property>
-              </packing>
             </child>
             <child>
               <object class="GtkLabel" id="label6">
-                <property name="visible">True</property>
-                <property name="can_focus">False</property>
                 <property name="margin_start">12</property>
                 <property name="xalign">1</property>
                 <property name="label" translatable="yes">Full Nam_e:</property>
-                <property name="use_underline">True</property>
+                <property name="use_underline">1</property>
                 <property name="mnemonic_widget">entry2</property>
+                <layout>
+                  <property name="left_attach">0</property>
+                  <property name="top_attach">1</property>
+                  <property name="column-span">1</property>
+                  <property name="row-span">1</property>
+                </layout>
               </object>
-              <packing>
-                <property name="left_attach">0</property>
-                <property name="top_attach">1</property>
-                <property name="width">1</property>
-                <property name="height">1</property>
-              </packing>
             </child>
             <child>
               <object class="GtkEntry" id="entry2">
-                <property name="visible">True</property>
-                <property name="can_focus">True</property>
-                <property name="hexpand">True</property>
+                <property name="can_focus">1</property>
+                <property name="hexpand">1</property>
                 <property name="invisible_char">●</property>
+                <layout>
+                  <property name="left_attach">1</property>
+                  <property name="top_attach">1</property>
+                  <property name="column-span">1</property>
+                  <property name="row-span">1</property>
+                </layout>
               </object>
-              <packing>
-                <property name="left_attach">1</property>
-                <property name="top_attach">1</property>
-                <property name="width">1</property>
-                <property name="height">1</property>
-              </packing>
             </child>
             <child>
               <object class="GtkLabel" id="label7">
-                <property name="visible">True</property>
-                <property name="can_focus">False</property>
                 <property name="margin_start">12</property>
                 <property name="label" translatable="yes">Email _Address:</property>
-                <property name="use_underline">True</property>
+                <property name="use_underline">1</property>
+                <layout>
+                  <property name="left_attach">0</property>
+                  <property name="top_attach">2</property>
+                  <property name="column-span">1</property>
+                  <property name="row-span">1</property>
+                </layout>
               </object>
-              <packing>
-                <property name="left_attach">0</property>
-                <property name="top_attach">2</property>
-                <property name="width">1</property>
-                <property name="height">1</property>
-              </packing>
             </child>
             <child>
               <object class="GtkEntry" id="entry3">
-                <property name="visible">True</property>
-                <property name="can_focus">True</property>
-                <property name="hexpand">True</property>
+                <property name="can_focus">1</property>
+                <property name="hexpand">1</property>
                 <property name="invisible_char">●</property>
+                <layout>
+                  <property name="left_attach">1</property>
+                  <property name="top_attach">2</property>
+                  <property name="column-span">1</property>
+                  <property name="row-span">1</property>
+                </layout>
               </object>
-              <packing>
-                <property name="left_attach">1</property>
-                <property name="top_attach">2</property>
-                <property name="width">1</property>
-                <property name="height">1</property>
-              </packing>
             </child>
           </object>
         </child>
         <child>
           <object class="GtkGrid" id="grid3">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="row_spacing">6</property>
             <property name="column_spacing">6</property>
             <child>
               <object class="GtkLabel" id="label8">
-                <property name="visible">True</property>
-                <property name="can_focus">False</property>
                 <property name="xalign">0</property>
                 <property name="label" translatable="yes">&lt;b&gt;Optional Information&lt;/b&gt;</property>
-                <property name="use_markup">True</property>
+                <property name="use_markup">1</property>
+                <layout>
+                  <property name="left_attach">0</property>
+                  <property name="top_attach">0</property>
+                  <property name="column-span">3</property>
+                  <property name="row-span">1</property>
+                </layout>
               </object>
-              <packing>
-                <property name="left_attach">0</property>
-                <property name="top_attach">0</property>
-                <property name="width">3</property>
-                <property name="height">1</property>
-              </packing>
             </child>
             <child>
               <object class="GtkLabel" id="label9">
-                <property name="visible">True</property>
-                <property name="can_focus">False</property>
                 <property name="margin_start">12</property>
                 <property name="xalign">1</property>
                 <property name="label" translatable="yes">Re_ply-To:</property>
-                <property name="use_underline">True</property>
+                <property name="use_underline">1</property>
                 <property name="mnemonic_widget">entry4</property>
+                <layout>
+                  <property name="left_attach">0</property>
+                  <property name="top_attach">1</property>
+                  <property name="column-span">1</property>
+                  <property name="row-span">1</property>
+                </layout>
               </object>
-              <packing>
-                <property name="left_attach">0</property>
-                <property name="top_attach">1</property>
-                <property name="width">1</property>
-                <property name="height">1</property>
-              </packing>
             </child>
             <child>
               <object class="GtkEntry" id="entry4">
-                <property name="visible">True</property>
-                <property name="can_focus">True</property>
-                <property name="hexpand">True</property>
+                <property name="can_focus">1</property>
+                <property name="hexpand">1</property>
                 <property name="invisible_char">●</property>
+                <layout>
+                  <property name="left_attach">1</property>
+                  <property name="top_attach">1</property>
+                  <property name="column-span">2</property>
+                  <property name="row-span">1</property>
+                </layout>
               </object>
-              <packing>
-                <property name="left_attach">1</property>
-                <property name="top_attach">1</property>
-                <property name="width">2</property>
-                <property name="height">1</property>
-              </packing>
             </child>
             <child>
               <object class="GtkLabel" id="label10">
-                <property name="visible">True</property>
-                <property name="can_focus">False</property>
                 <property name="margin_start">12</property>
                 <property name="xalign">1</property>
                 <property name="label" translatable="yes">Or_ganization:</property>
-                <property name="use_underline">True</property>
+                <property name="use_underline">1</property>
                 <property name="mnemonic_widget">entry5</property>
+                <layout>
+                  <property name="left_attach">0</property>
+                  <property name="top_attach">2</property>
+                  <property name="column-span">1</property>
+                  <property name="row-span">1</property>
+                </layout>
               </object>
-              <packing>
-                <property name="left_attach">0</property>
-                <property name="top_attach">2</property>
-                <property name="width">1</property>
-                <property name="height">1</property>
-              </packing>
             </child>
             <child>
               <object class="GtkEntry" id="entry5">
-                <property name="visible">True</property>
-                <property name="can_focus">True</property>
+                <property name="can_focus">1</property>
                 <property name="invisible_char">●</property>
+                <layout>
+                  <property name="left_attach">1</property>
+                  <property name="top_attach">2</property>
+                  <property name="column-span">2</property>
+                  <property name="row-span">1</property>
+                </layout>
               </object>
-              <packing>
-                <property name="left_attach">1</property>
-                <property name="top_attach">2</property>
-                <property name="width">2</property>
-                <property name="height">1</property>
-              </packing>
             </child>
           </object>
         </child>
@@ -260,13 +225,12 @@ For example, "Work" or "Personal".</property>
     </child>
   </object>
   <object class="GtkSizeGroup" id="sizegroup1">
-    <property name="mode">horizontal</property>
     <widgets>
-      <widget name="label4" />
-      <widget name="label6" />
-      <widget name="label7" />
-      <widget name="label9" />
-      <widget name="label10" />
+      <widget name="label4"/>
+      <widget name="label6"/>
+      <widget name="label7"/>
+      <widget name="label9"/>
+      <widget name="label10"/>
     </widgets>
   </object>
 </interface>

diff --git a/testsuite/reftests/sizegroups-get-preferred-null.ref.ui b/testsuite/reftests/sizegroups-get-preferred-null.ref.ui
index 54aa61c4b049bcd6f49ac0000c5efbcb3b702a37..b5151592fa741dea7b561a754366d64463a6b13d 100644 (file)
--- a/testsuite/reftests/sizegroups-get-preferred-null.ref.ui
+++ b/testsuite/reftests/sizegroups-get-preferred-null.ref.ui
@@ -1,21 +1,16 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
-  <!-- interface-requires gtk+ 3.0 -->
   <object class="GtkWindow" id="window1">
-    <property name="can_focus">False</property>
     <property name="type">popup</property>
-      <child>
-        <object class="GtkFixed" id="grid1">
-          <property name="visible">True</property>
-          <property name="can_focus">False</property>
-          <child>
-            <object class="GtkLabel" id="label1">
-              <property name="visible">True</property>
-              <property name="label" translatable="yes">Check that a container that calls gtk_widget_get_preferred_width/height() with natural or minimum being NULL doesn't cause a crash with size groups.</property>
-              <property name="wrap">True</property>
-            </object>
-          </child>
-        </object>
+    <child>
+      <object class="GtkFixed" id="grid1">
+        <child>
+          <object class="GtkLabel" id="label1">
+            <property name="label" translatable="yes">Check that a container that calls gtk_widget_get_preferred_width/height() with natural or minimum being NULL doesn&apos;t cause a crash with size groups.</property>
+            <property name="wrap">1</property>
+          </object>
+        </child>
+      </object>
     </child>
   </object>
 </interface>

diff --git a/testsuite/reftests/sizegroups-get-preferred-null.ui b/testsuite/reftests/sizegroups-get-preferred-null.ui
index 23b78f95d1f71fd09fa4b43f486fc048ac543bd6..b0f8074c84c29eb7a9b0e7dda45d9b47640c9573 100644 (file)
--- a/testsuite/reftests/sizegroups-get-preferred-null.ui
+++ b/testsuite/reftests/sizegroups-get-preferred-null.ui
@@ -1,26 +1,21 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
-  <!-- interface-requires gtk+ 3.0 -->
   <object class="GtkWindow" id="window1">
-    <property name="can_focus">False</property>
     <property name="type">popup</property>
-      <child>
-        <object class="GtkFixed" id="grid1">
-          <property name="visible">True</property>
-          <property name="can_focus">False</property>
-          <child>
-            <object class="GtkLabel" id="label1">
-              <property name="visible">True</property>
-              <property name="label" translatable="yes">Check that a container that calls gtk_widget_get_preferred_width/height() with natural or minimum being NULL doesn't cause a crash with size groups.</property>
-              <property name="wrap">True</property>
-            </object>
-          </child>
-        </object>
+    <child>
+      <object class="GtkFixed" id="grid1">
+        <child>
+          <object class="GtkLabel" id="label1">
+            <property name="label" translatable="yes">Check that a container that calls gtk_widget_get_preferred_width/height() with natural or minimum being NULL doesn&apos;t cause a crash with size groups.</property>
+            <property name="wrap">1</property>
+          </object>
+        </child>
+      </object>
     </child>
   </object>
   <object class="GtkSizeGroup" id="sizegroup1">
     <widgets>
-      <widget name="label1" />
+      <widget name="label1"/>
     </widgets>
   </object>
 </interface>

diff --git a/testsuite/reftests/statusbar-remove-all.ref.ui b/testsuite/reftests/statusbar-remove-all.ref.ui
index 401c89b0dce336b2944d9a33687f78005d5ac344..169f08fc439c5926f67dae7a1d4ec84cd5aa384e 100644 (file)
--- a/testsuite/reftests/statusbar-remove-all.ref.ui
+++ b/testsuite/reftests/statusbar-remove-all.ref.ui
@@ -1,14 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!-- Generated with glade 3.18.1 -->
 <interface>
   <requires lib="gtk+" version="3.12"/>
   <object class="GtkWindow" id="window1">
-    <property name="can_focus">False</property>
     <property name="type">popup</property>
     <child>
       <object class="GtkStatusbar" id="statusbar1">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
         <property name="margin_start">10</property>
         <property name="margin_end">10</property>
         <property name="margin_top">6</property>

diff --git a/testsuite/reftests/statusbar-remove-all.ui b/testsuite/reftests/statusbar-remove-all.ui
index 76c1a17ae9ebaf96fd53e1b6cacc7a04d75a41b4..26113ca55215f4f0303145f87618ee92bfa132f1 100644 (file)
--- a/testsuite/reftests/statusbar-remove-all.ui
+++ b/testsuite/reftests/statusbar-remove-all.ui
@@ -1,14 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!-- Generated with glade 3.18.1 -->
 <interface>
   <requires lib="gtk+" version="3.12"/>
   <object class="GtkWindow" id="window1">
-    <property name="can_focus">False</property>
     <property name="type">popup</property>
     <child>
       <object class="GtkStatusbar" id="statusbar1">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
         <property name="margin_start">10</property>
         <property name="margin_end">10</property>
         <property name="margin_top">6</property>

diff --git a/testsuite/reftests/style-context-save-inheritance.ref.ui b/testsuite/reftests/style-context-save-inheritance.ref.ui
index 09b5af581ad444e382ae3a233518a6b405d1241e..abbb2f709b970278e5d8ebb4e44623664b6ac1a8 100644 (file)
--- a/testsuite/reftests/style-context-save-inheritance.ref.ui
+++ b/testsuite/reftests/style-context-save-inheritance.ref.ui
@@ -1,18 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!-- Generated with glade 3.18.3 -->
 <interface>
   <requires lib="gtk+" version="3.12"/>
   <object class="GtkWindow" id="window1">
-    <property name="can_focus">False</property>
     <property name="type">popup</property>
     <child>
       <object class="GtkLabel" id="label1">
         <property name="name">reference</property>
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
         <property name="label" translatable="yes">GREEN
-&lt;a href="http://www.gtk.org"&gt;GREEN&lt;/a&gt;</property>
-        <property name="use_markup">True</property>
+&lt;a href=&quot;http://www.gtk.org&quot;&gt;GREEN&lt;/a&gt;</property>
+        <property name="use_markup">1</property>
       </object>
     </child>
   </object>

diff --git a/testsuite/reftests/style-context-save-inheritance.ui b/testsuite/reftests/style-context-save-inheritance.ui
index 022033b22cf7b40473ec39a6cf3cdf47653e7e08..c8395ae1b62c8b0baded257a85d831dac5613eac 100644 (file)
--- a/testsuite/reftests/style-context-save-inheritance.ui
+++ b/testsuite/reftests/style-context-save-inheritance.ui
@@ -1,17 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!-- Generated with glade 3.18.3 -->
 <interface>
   <requires lib="gtk+" version="3.12"/>
   <object class="GtkWindow" id="window1">
-    <property name="can_focus">False</property>
     <property name="type">popup</property>
     <child>
       <object class="GtkLabel" id="label1">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
         <property name="label" translatable="yes">GREEN
-&lt;a href="http://www.gtk.org"&gt;GREEN&lt;/a&gt;</property>
-        <property name="use_markup">True</property>
+&lt;a href=&quot;http://www.gtk.org&quot;&gt;GREEN&lt;/a&gt;</property>
+        <property name="use_markup">1</property>
       </object>
     </child>
   </object>

diff --git a/testsuite/reftests/style-properties-only-child.ref.ui b/testsuite/reftests/style-properties-only-child.ref.ui
index e6e4d3bd39524d4444863237f270f91039cfed48..78bfbf4c79bcbff641ce26dbd3d898e276aa94ee 100644 (file)
--- a/testsuite/reftests/style-properties-only-child.ref.ui
+++ b/testsuite/reftests/style-properties-only-child.ref.ui
@@ -1,20 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
-  <!-- interface-requires gtk+ 3.0 -->
   <object class="GtkWindow" id="window1">
-    <property name="can_focus">False</property>
     <property name="type">popup</property>
     <property name="width_request">300</property>
     <property name="height_request">300</property>
     <child>
       <object class="GtkBox" id="box1">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
         <property name="orientation">vertical</property>
         <child>
           <object class="GtkButton" id="button1">
-            <property name="visible">True</property>
-            <property name="can_focus">True</property>
+            <property name="can_focus">1</property>
             <property name="label">Foo</property>
             <style>
               <class name="only-child-ref"/>

diff --git a/testsuite/reftests/style-properties-only-child.ui b/testsuite/reftests/style-properties-only-child.ui
index 46d5a8c695525017b314f0197522d6862c0083ee..415b9de3a1e851157aca7c91433bce3da424b0a3 100644 (file)
--- a/testsuite/reftests/style-properties-only-child.ui
+++ b/testsuite/reftests/style-properties-only-child.ui
@@ -1,20 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
-  <!-- interface-requires gtk+ 3.0 -->
   <object class="GtkWindow" id="window1">
-    <property name="can_focus">False</property>
     <property name="type">popup</property>
     <property name="width_request">300</property>
     <property name="height_request">300</property>
     <child>
       <object class="GtkBox" id="box1">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
         <property name="orientation">vertical</property>
         <child>
           <object class="GtkButton" id="button1">
-            <property name="visible">True</property>
-            <property name="can_focus">True</property>
+            <property name="can_focus">1</property>
             <property name="label">Foo</property>
             <style>
               <class name="only-child-notref"/>

diff --git a/testsuite/reftests/symbolic-icon-translucent-color.ref.ui b/testsuite/reftests/symbolic-icon-translucent-color.ref.ui
index 0319b38b11114127132db394fe3104115566f0f9..7d86e0b5f5c4fb43d9ea623218e96c1119ba289f 100644 (file)
--- a/testsuite/reftests/symbolic-icon-translucent-color.ref.ui
+++ b/testsuite/reftests/symbolic-icon-translucent-color.ref.ui
@@ -1,15 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!-- Generated with glade 3.15.3 on Fri Oct  4 16:19:20 2013 -->
 <interface>
-  <!-- interface-requires gtk+ 3.10 -->
   <object class="GtkWindow" id="window1">
-    <property name="can_focus">False</property>
     <property name="type">popup</property>
     <child>
       <object class="GtkImage" id="image1">
         <property name="name">reference</property>
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
         <property name="icon_name">media-playback-stop-symbolic</property>
       </object>
     </child>

diff --git a/testsuite/reftests/symbolic-icon-translucent-color.ui b/testsuite/reftests/symbolic-icon-translucent-color.ui
index 8d945c498de413975fd08d946f7124522f40753e..138fb2c5783f275ec348f54230eb120355eb06f8 100644 (file)
--- a/testsuite/reftests/symbolic-icon-translucent-color.ui
+++ b/testsuite/reftests/symbolic-icon-translucent-color.ui
@@ -1,14 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!-- Generated with glade 3.15.3 on Fri Oct  4 16:16:58 2013 -->
 <interface>
-  <!-- interface-requires gtk+ 3.10 -->
   <object class="GtkWindow" id="window1">
-    <property name="can_focus">False</property>
     <property name="type">popup</property>
     <child>
       <object class="GtkImage" id="image1">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
         <property name="icon_name">media-playback-stop-symbolic</property>
       </object>
     </child>

diff --git a/testsuite/reftests/textview-border-windows.ref.ui b/testsuite/reftests/textview-border-windows.ref.ui
index 642feb169445ee87fb342e51ce416aa06876ecf0..2d6ea088eb4b9e3cb1d7ec580e1ee5e829842726 100644 (file)
--- a/testsuite/reftests/textview-border-windows.ref.ui
+++ b/testsuite/reftests/textview-border-windows.ref.ui
@@ -1,72 +1,59 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!-- Generated with glade 3.18.3 -->
 <interface>
   <requires lib="gtk+" version="3.0"/>
   <object class="GtkWindow" id="window">
-    <property name="can_focus">False</property>
     <property name="type">popup</property>
     <child>
       <object class="GtkGrid" id="grid1">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
         <child>
           <object class="GtkLabel" id="label1">
             <property name="width_request">100</property>
             <property name="height_request">100</property>
-            <property name="visible">True</property>
+            <layout>
+              <property name="left_attach">1</property>
+              <property name="top_attach">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">1</property>
-            <property name="top_attach">1</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="label_n">
             <property name="name">label_n</property>
             <property name="height_request">30</property>
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
+            <layout>
+              <property name="left_attach">1</property>
+              <property name="top_attach">0</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">1</property>
-            <property name="top_attach">0</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="label_w">
             <property name="name">label_w</property>
             <property name="width_request">30</property>
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
+            <layout>
+              <property name="left_attach">0</property>
+              <property name="top_attach">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">0</property>
-            <property name="top_attach">1</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="label_e">
             <property name="name">label_e</property>
             <property name="width_request">30</property>
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
+            <layout>
+              <property name="left_attach">2</property>
+              <property name="top_attach">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">2</property>
-            <property name="top_attach">1</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="label_s">
             <property name="name">label_s</property>
             <property name="height_request">30</property>
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
+            <layout>
+              <property name="left_attach">1</property>
+              <property name="top_attach">2</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">1</property>
-            <property name="top_attach">2</property>
-          </packing>
         </child>
       </object>
     </child>

diff --git a/testsuite/reftests/textview-border-windows.ui b/testsuite/reftests/textview-border-windows.ui
index 5ca2b2e078b3c5021f5e7305576fbcc5b1ecfedc..711576acec819002fd61296c08acf0feda663580 100644 (file)
--- a/testsuite/reftests/textview-border-windows.ui
+++ b/testsuite/reftests/textview-border-windows.ui
@@ -1,16 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!-- Generated with glade 3.18.3 -->
 <interface>
   <requires lib="gtk+" version="3.0"/>
   <object class="GtkWindow" id="window">
-    <property name="can_focus">False</property>
     <property name="type">popup</property>
     <child>
       <object class="GtkTextView" id="textview1">
         <property name="width_request">160</property>
         <property name="height_request">160</property>
-        <property name="visible">True</property>
-        <property name="can_focus">True</property>
+        <property name="can_focus">1</property>
         <property name="wrap_mode">word</property>
         <signal name="map" handler="reftest:add_border_windows" swapped="no"/>
       </object>

diff --git a/testsuite/reftests/textview-margins.ref.ui b/testsuite/reftests/textview-margins.ref.ui
index 624ba062b7f9b2eabe0c3e0b22fa6ba6ea862b70..b9a99288c8f629aa214dd95ff0fdcfd721b7b616 100644 (file)
--- a/testsuite/reftests/textview-margins.ref.ui
+++ b/testsuite/reftests/textview-margins.ref.ui
@@ -1,19 +1,16 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!-- Generated with glade 3.18.3 -->
 <interface>
   <requires lib="gtk+" version="3.0"/>
   <object class="GtkTextBuffer" id="textbuffer1">
     <property name="text" translatable="yes">Lorem ipsum dolor sit amet, consectetur adipisci elit, sed eiusmod tempor incidunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquid ex ea commodi consequat. Quis aute iure reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint obcaecat cupiditat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum</property>
   </object>
   <object class="GtkWindow" id="window">
-    <property name="can_focus">False</property>
     <property name="type">popup</property>
     <property name="default_width">106</property>
     <property name="resizable">0</property>
     <child>
       <object class="GtkTextView" id="textview1">
-        <property name="visible">True</property>
-        <property name="can_focus">True</property>
+        <property name="can_focus">1</property>
         <property name="wrap_mode">word</property>
         <property name="margin_start">8</property>
         <property name="margin_end">8</property>

diff --git a/testsuite/reftests/textview-margins.ui b/testsuite/reftests/textview-margins.ui
index 34c2d4cc37f8aef4fb6e2e3119db3e57da6a9801..275a0ab21642c924fbbb36f4918becc9c62af57a 100644 (file)
--- a/testsuite/reftests/textview-margins.ui
+++ b/testsuite/reftests/textview-margins.ui
@@ -1,19 +1,16 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!-- Generated with glade 3.18.3 -->
 <interface>
   <requires lib="gtk+" version="3.0"/>
   <object class="GtkTextBuffer" id="textbuffer1">
     <property name="text" translatable="yes">Lorem ipsum dolor sit amet, consectetur adipisci elit, sed eiusmod tempor incidunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquid ex ea commodi consequat. Quis aute iure reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint obcaecat cupiditat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum</property>
   </object>
   <object class="GtkWindow" id="window">
-    <property name="can_focus">False</property>
     <property name="type">popup</property>
     <property name="default_width">106</property>
     <property name="resizable">0</property>
     <child>
       <object class="GtkTextView" id="textview1">
-        <property name="visible">True</property>
-        <property name="can_focus">True</property>
+        <property name="can_focus">1</property>
         <property name="wrap_mode">word</property>
         <property name="margin_start">2</property>
         <property name="margin_end">2</property>

diff --git a/testsuite/reftests/textview-tags.ref.ui b/testsuite/reftests/textview-tags.ref.ui
index 97c0896d084ab9bd0376d88caf3871a6893d3422..8e6e92e08f7cd37b3250f334125623535d1fb6cb 100644 (file)
--- a/testsuite/reftests/textview-tags.ref.ui
+++ b/testsuite/reftests/textview-tags.ref.ui
@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!-- Generated with glade 3.18.1 -->
 <interface>
   <object class="GtkTextTagTable" id="texttagtable1">
     <child type="tag">
@@ -36,11 +35,9 @@
     <property name="text" translatable="yes">red or blue or what</property>
   </object>
   <object class="GtkWindow" id="window1">
-    <property name="can_focus">False</property>
     <child>
       <object class="GtkTextView" id="textview1">
-        <property name="visible">True</property>
-        <property name="can_focus">True</property>
+        <property name="can_focus">1</property>
         <property name="buffer">textbuffer1</property>
         <signal name="map" handler="reftest:apply_tags_red_blue" swapped="no"/>
       </object>

diff --git a/testsuite/reftests/textview-tags.ui b/testsuite/reftests/textview-tags.ui
index 622a08a781d8050174874d04d2073dbebc246b48..c9371c357d8e0c931d52e8bba322bfb5728fbc3b 100644 (file)
--- a/testsuite/reftests/textview-tags.ui
+++ b/testsuite/reftests/textview-tags.ui
@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!-- Generated with glade 3.18.1 -->
 <interface>
   <object class="GtkTextTagTable" id="texttagtable1">
     <child type="tag">
@@ -36,11 +35,9 @@
     <property name="text" translatable="yes">red or blue or what</property>
   </object>
   <object class="GtkWindow" id="window1">
-    <property name="can_focus">False</property>
     <child>
       <object class="GtkTextView" id="textview1">
-        <property name="visible">True</property>
-        <property name="can_focus">True</property>
+        <property name="can_focus">1</property>
         <property name="buffer">textbuffer1</property>
         <signal name="map" handler="reftest:apply_tags_blue" swapped="no"/>
       </object>

diff --git a/testsuite/reftests/toplevel-vs-popup.ref.ui b/testsuite/reftests/toplevel-vs-popup.ref.ui
index 35dd4092f4a515a4d7c48ccb20ec35a4bbad751b..56115658feb038839371353407f39859bc504ba8 100644 (file)
--- a/testsuite/reftests/toplevel-vs-popup.ref.ui
+++ b/testsuite/reftests/toplevel-vs-popup.ref.ui
@@ -1,13 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
-  <!-- interface-requires gtk+ 3.0 -->
   <object class="GtkWindow" id="window1">
-    <property name="can_focus">False</property>
     <property name="type">popup</property>
     <child>
       <object class="GtkLabel" id="label1">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
         <property name="label" translatable="yes">Hello World</property>
       </object>
     </child>

diff --git a/testsuite/reftests/toplevel-vs-popup.ui b/testsuite/reftests/toplevel-vs-popup.ui
index 3707d7b654d57b60fbab58c3cb2b498ead2f2a36..fdd99a68c97e379ad7dc2de73969e161159c97b9 100644 (file)
--- a/testsuite/reftests/toplevel-vs-popup.ui
+++ b/testsuite/reftests/toplevel-vs-popup.ui
@@ -1,12 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
-  <!-- interface-requires gtk+ 3.0 -->
   <object class="GtkWindow" id="window1">
-    <property name="can_focus">False</property>
     <child>
       <object class="GtkLabel" id="label1">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
         <property name="label" translatable="yes">Hello World</property>
       </object>
     </child>

diff --git a/testsuite/reftests/treeview-crash-too-wide.ref.ui b/testsuite/reftests/treeview-crash-too-wide.ref.ui
index a588e83fbc523768effa7dbbf70528def8367eaf..09315136e4f6a45405ce1cf127c553354c49af7f 100644 (file)
--- a/testsuite/reftests/treeview-crash-too-wide.ref.ui
+++ b/testsuite/reftests/treeview-crash-too-wide.ref.ui
@@ -1,10 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!-- Generated with glade 3.18.3 -->
 <interface>
   <requires lib="gtk+" version="3.12"/>
   <object class="GtkListStore" id="liststore1">
     <columns>
-      <!-- column-name data -->
       <column type="gchararray"/>
     </columns>
     <data>
@@ -16,35 +14,32 @@ aaaaa aaaaa aaaaa aaaaa aaaaa aaaaa aaaaa aaaaa aaaaa aaaaa aaaaa aaaaa aaaaa aa
     </data>
   </object>
   <object class="GtkWindow" id="window1">
-    <property name="can_focus">False</property>
     <child>
-          <object class="GtkScrolledWindow" id="scrolledwindow1">
-            <property name="visible">True</property>
-            <property name="can_focus">True</property>
-            <property name="shadow_type">in</property>
+      <object class="GtkScrolledWindow" id="scrolledwindow1">
+        <property name="can_focus">1</property>
+        <property name="shadow_type">in</property>
+        <child>
+          <object class="GtkTreeView" id="treeview1">
+            <property name="can_focus">1</property>
+            <property name="model">liststore1</property>
+            <child internal-child="selection">
+              <object class="GtkTreeSelection" id="treeview-selection1"/>
+            </child>
             <child>
-              <object class="GtkTreeView" id="treeview1">
-                <property name="visible">True</property>
-                <property name="can_focus">True</property>
-                <property name="model">liststore1</property>
-                <child internal-child="selection">
-                  <object class="GtkTreeSelection" id="treeview-selection1"/>
-                </child>
+              <object class="GtkTreeViewColumn" id="treeviewcolumn1">
+                <property name="resizable">1</property>
+                <property name="title" translatable="yes">column</property>
                 <child>
-                  <object class="GtkTreeViewColumn" id="treeviewcolumn1">
-                    <property name="resizable">True</property>
-                    <property name="title" translatable="yes">column</property>
-                    <child>
-                      <object class="GtkCellRendererText" id="cellrenderertext1"/>
-                      <attributes>
-                        <attribute name="markup">0</attribute>
-                      </attributes>
-                    </child>
-                  </object>
+                  <object class="GtkCellRendererText" id="cellrenderertext1"/>
+                  <attributes>
+                    <attribute name="markup">0</attribute>
+                  </attributes>
                 </child>
               </object>
             </child>
           </object>
+        </child>
+      </object>
     </child>
   </object>
 </interface>

diff --git a/testsuite/reftests/treeview-crash-too-wide.ui b/testsuite/reftests/treeview-crash-too-wide.ui
index a588e83fbc523768effa7dbbf70528def8367eaf..09315136e4f6a45405ce1cf127c553354c49af7f 100644 (file)
--- a/testsuite/reftests/treeview-crash-too-wide.ui
+++ b/testsuite/reftests/treeview-crash-too-wide.ui
@@ -1,10 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!-- Generated with glade 3.18.3 -->
 <interface>
   <requires lib="gtk+" version="3.12"/>
   <object class="GtkListStore" id="liststore1">
     <columns>
-      <!-- column-name data -->
       <column type="gchararray"/>
     </columns>
     <data>
@@ -16,35 +14,32 @@ aaaaa aaaaa aaaaa aaaaa aaaaa aaaaa aaaaa aaaaa aaaaa aaaaa aaaaa aaaaa aaaaa aa
     </data>
   </object>
   <object class="GtkWindow" id="window1">
-    <property name="can_focus">False</property>
     <child>
-          <object class="GtkScrolledWindow" id="scrolledwindow1">
-            <property name="visible">True</property>
-            <property name="can_focus">True</property>
-            <property name="shadow_type">in</property>
+      <object class="GtkScrolledWindow" id="scrolledwindow1">
+        <property name="can_focus">1</property>
+        <property name="shadow_type">in</property>
+        <child>
+          <object class="GtkTreeView" id="treeview1">
+            <property name="can_focus">1</property>
+            <property name="model">liststore1</property>
+            <child internal-child="selection">
+              <object class="GtkTreeSelection" id="treeview-selection1"/>
+            </child>
             <child>
-              <object class="GtkTreeView" id="treeview1">
-                <property name="visible">True</property>
-                <property name="can_focus">True</property>
-                <property name="model">liststore1</property>
-                <child internal-child="selection">
-                  <object class="GtkTreeSelection" id="treeview-selection1"/>
-                </child>
+              <object class="GtkTreeViewColumn" id="treeviewcolumn1">
+                <property name="resizable">1</property>
+                <property name="title" translatable="yes">column</property>
                 <child>
-                  <object class="GtkTreeViewColumn" id="treeviewcolumn1">
-                    <property name="resizable">True</property>
-                    <property name="title" translatable="yes">column</property>
-                    <child>
-                      <object class="GtkCellRendererText" id="cellrenderertext1"/>
-                      <attributes>
-                        <attribute name="markup">0</attribute>
-                      </attributes>
-                    </child>
-                  </object>
+                  <object class="GtkCellRendererText" id="cellrenderertext1"/>
+                  <attributes>
+                    <attribute name="markup">0</attribute>
+                  </attributes>
                 </child>
               </object>
             </child>
           </object>
+        </child>
+      </object>
     </child>
   </object>
 </interface>

diff --git a/testsuite/reftests/treeview-fixed-height.ref.ui b/testsuite/reftests/treeview-fixed-height.ref.ui
index 9a244f552f7e54b7c87f66633ab712ec12d69b69..790665832b0c4273e66602100f17c0c1c5c1968a 100644 (file)
--- a/testsuite/reftests/treeview-fixed-height.ref.ui
+++ b/testsuite/reftests/treeview-fixed-height.ref.ui
@@ -1,13 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
-  <!-- interface-requires gtk+ 3.0 -->
   <object class="GtkListStore" id="liststore1">
     <columns>
-      <!-- column-name Cool -->
       <column type="gboolean"/>
-      <!-- column-name Name -->
       <column type="gchararray"/>
-      <!-- column-name Nick -->
       <column type="gchararray"/>
     </columns>
     <data>
@@ -24,12 +20,10 @@
     </data>
   </object>
   <object class="GtkWindow" id="window">
-    <property name="can_focus">False</property>
     <property name="type">popup</property>
     <child>
       <object class="GtkTreeView" id="treeview1">
-        <property name="visible">True</property>
-        <property name="can_focus">True</property>
+        <property name="can_focus">1</property>
         <property name="model">liststore1</property>
         <child internal-child="selection">
           <object class="GtkTreeSelection" id="treeview-selection"/>

diff --git a/testsuite/reftests/treeview-fixed-height.ui b/testsuite/reftests/treeview-fixed-height.ui
index 1744f53fa2054c38feb863bf5b84d25945a8b161..db871a56c595fc84406d08f3ecf2113110ef5389 100644 (file)
--- a/testsuite/reftests/treeview-fixed-height.ui
+++ b/testsuite/reftests/treeview-fixed-height.ui
@@ -1,13 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
-  <!-- interface-requires gtk+ 3.0 -->
   <object class="GtkListStore" id="liststore1">
     <columns>
-      <!-- column-name Cool -->
       <column type="gboolean"/>
-      <!-- column-name Name -->
       <column type="gchararray"/>
-      <!-- column-name Nick -->
       <column type="gchararray"/>
     </columns>
     <data>
@@ -24,14 +20,12 @@
     </data>
   </object>
   <object class="GtkWindow" id="window">
-    <property name="can_focus">False</property>
     <property name="type">popup</property>
     <child>
       <object class="GtkTreeView" id="treeview1">
-        <property name="visible">True</property>
-        <property name="can_focus">True</property>
+        <property name="can_focus">1</property>
         <property name="model">liststore1</property>
-        <property name="fixed-height-mode">True</property>
+        <property name="fixed-height-mode">1</property>
         <child internal-child="selection">
           <object class="GtkTreeSelection" id="treeview-selection"/>
         </child>

diff --git a/testsuite/reftests/treeview-headers-hidden.ref.ui b/testsuite/reftests/treeview-headers-hidden.ref.ui
index 6ee254c0d83bf1051d832522fd74f5804a8ccd8d..9a7b147dfca29fe03e3b37749810b12dd233ffc5 100644 (file)
--- a/testsuite/reftests/treeview-headers-hidden.ref.ui
+++ b/testsuite/reftests/treeview-headers-hidden.ref.ui
@@ -1,9 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
-  <!-- interface-requires gtk+ 3.0 -->
   <object class="GtkListStore" id="liststore1">
     <columns>
-      <!-- column-name Name -->
       <column type="gchararray"/>
     </columns>
     <data>
@@ -16,14 +14,12 @@
     </data>
   </object>
   <object class="GtkWindow" id="window">
-    <property name="can_focus">False</property>
     <property name="type">popup</property>
     <child>
       <object class="GtkTreeView" id="treeview1">
-        <property name="visible">True</property>
-        <property name="can_focus">True</property>
+        <property name="can_focus">1</property>
         <property name="model">liststore1</property>
-        <property name="headers-visible">False</property>
+        <property name="headers-visible">0</property>
         <child internal-child="selection">
           <object class="GtkTreeSelection" id="treeview-selection"/>
         </child>

diff --git a/testsuite/reftests/treeview-headers-hidden.ui b/testsuite/reftests/treeview-headers-hidden.ui
index 6ee254c0d83bf1051d832522fd74f5804a8ccd8d..9a7b147dfca29fe03e3b37749810b12dd233ffc5 100644 (file)
--- a/testsuite/reftests/treeview-headers-hidden.ui
+++ b/testsuite/reftests/treeview-headers-hidden.ui
@@ -1,9 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
-  <!-- interface-requires gtk+ 3.0 -->
   <object class="GtkListStore" id="liststore1">
     <columns>
-      <!-- column-name Name -->
       <column type="gchararray"/>
     </columns>
     <data>
@@ -16,14 +14,12 @@
     </data>
   </object>
   <object class="GtkWindow" id="window">
-    <property name="can_focus">False</property>
     <property name="type">popup</property>
     <child>
       <object class="GtkTreeView" id="treeview1">
-        <property name="visible">True</property>
-        <property name="can_focus">True</property>
+        <property name="can_focus">1</property>
         <property name="model">liststore1</property>
-        <property name="headers-visible">False</property>
+        <property name="headers-visible">0</property>
         <child internal-child="selection">
           <object class="GtkTreeSelection" id="treeview-selection"/>
         </child>

diff --git a/testsuite/reftests/unresolvable.ref.ui b/testsuite/reftests/unresolvable.ref.ui
index ac585215e68cbfb1086918f0f6135d1240e07ff4..b5ccb79617b6146c65d16af494b5a427f997609a 100644 (file)
--- a/testsuite/reftests/unresolvable.ref.ui
+++ b/testsuite/reftests/unresolvable.ref.ui
@@ -1,8 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
-  <!-- interface-requires gtk+ 3.0 -->
   <object class="GtkWindow">
-    <property name="can_focus">False</property>
     <property name="type">popup</property>
     <child>
       <object class="GtkBox">

diff --git a/testsuite/reftests/unresolvable.ui b/testsuite/reftests/unresolvable.ui
index 1b4690393930d0a2f55740dc6644e17f02dce78a..f12da9077d0e0cbdc190fdfec2b24fcf3ef127bd 100644 (file)
--- a/testsuite/reftests/unresolvable.ui
+++ b/testsuite/reftests/unresolvable.ui
@@ -1,8 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
-  <!-- interface-requires gtk+ 3.0 -->
   <object class="GtkWindow">
-    <property name="can_focus">False</property>
     <property name="type">popup</property>
     <child>
       <object class="GtkBox">

diff --git a/testsuite/reftests/window-border-width.ref.ui b/testsuite/reftests/window-border-width.ref.ui
index 4bb19420c4e269c048a8e2a589fef23a195c5d7a..ea309cc149169cb4131778db44992eb5e8909bc8 100644 (file)
--- a/testsuite/reftests/window-border-width.ref.ui
+++ b/testsuite/reftests/window-border-width.ref.ui
@@ -1,19 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
-  <!-- interface-requires gtk+ 3.0 -->
   <object class="GtkWindow" id="window_information_collection">
-    <property name="can_focus">False</property>
     <property name="type">popup</property>
     <child>
       <object class="GtkBox" id="box1">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
         <child>
           <object class="GtkLabel" id="label1">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="label" translatable="yes">Hello World</property>
-            <property name="wrap">True</property>
+            <property name="wrap">1</property>
           </object>
         </child>
       </object>

diff --git a/testsuite/reftests/window-border-width.ui b/testsuite/reftests/window-border-width.ui
index 60d234800fd609f9bfeaaf0e6ff8f9eaa5685312..d020f3e40d829d3b9e46dae7d2e1fb71a46d265b 100644 (file)
--- a/testsuite/reftests/window-border-width.ui
+++ b/testsuite/reftests/window-border-width.ui
@@ -1,15 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
-  <!-- interface-requires gtk+ 3.0 -->
   <object class="GtkWindow" id="window_information_collection">
-    <property name="can_focus">False</property>
     <property name="type">popup</property>
     <child>
       <object class="GtkLabel" id="label1">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
         <property name="label" translatable="yes">Hello World</property>
-        <property name="wrap">True</property>
+        <property name="wrap">1</property>
       </object>
     </child>
   </object>

diff --git a/testsuite/reftests/window-default-size.ref.ui b/testsuite/reftests/window-default-size.ref.ui
index 9e6f6d9f82993bcf8223b6e2068fba67d55f943c..29b9330844b819e624d1dad1109cfa9e152ccf3e 100644 (file)
--- a/testsuite/reftests/window-default-size.ref.ui
+++ b/testsuite/reftests/window-default-size.ref.ui
@@ -1,10 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
-  <!-- interface-requires gtk+ 3.0 -->
   <object class="GtkWindow" id="window1">
     <property name="width_request">103</property>
     <property name="height_request">97</property>
-    <property name="can_focus">False</property>
     <property name="type">popup</property>
     <child>
       <placeholder/>

diff --git a/testsuite/reftests/window-default-size.ui b/testsuite/reftests/window-default-size.ui
index 2dff8cd4c274ce99816c1eb0c900c58c988e7ec5..143cac3e68778efc6e71ea5e32dc28b920a7105d 100644 (file)
--- a/testsuite/reftests/window-default-size.ui
+++ b/testsuite/reftests/window-default-size.ui
@@ -1,8 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
-  <!-- interface-requires gtk+ 3.0 -->
   <object class="GtkWindow" id="window1">
-    <property name="can_focus">False</property>
     <property name="type">popup</property>
     <property name="default_width">103</property>
     <property name="default_height">97</property>

diff --git a/testsuite/reftests/window-height-for-width.ref.ui b/testsuite/reftests/window-height-for-width.ref.ui
index f6647049afdc25a89bc5aec687bb4e16d7d847a6..1aafa7cdc52486a1661675effa9feaa872532da3 100644 (file)
--- a/testsuite/reftests/window-height-for-width.ref.ui
+++ b/testsuite/reftests/window-height-for-width.ref.ui
@@ -1,21 +1,17 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
   <object class="GtkDialog" id="window1">
-    <property name="can_focus">False</property>
     <property name="title" translatable="yes">Dubstep</property>
     <property name="type_hint">dialog</property>
-    <property name="resizable">False</property>
-    <property name="modal">True</property>
+    <property name="resizable">0</property>
+    <property name="modal">1</property>
     <property name="use_header_bar">1</property>
     <child internal-child="content_area">
       <object class="GtkBox" id="dialog-vbox2">
-        <property name="can_focus">False</property>
         <property name="orientation">vertical</property>
         <property name="spacing">2</property>
         <child>
           <object class="GtkLabel" id="screen_reader_blurb">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="margin_start">12</property>
             <property name="margin_end">6</property>
             <property name="margin_top">6</property>
@@ -26,8 +22,6 @@ Ts</property>
         </child>
         <child>
           <object class="GtkGrid" id="grid3">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="margin_start">12</property>
             <property name="margin_end">6</property>
             <property name="margin_top">12</property>
@@ -36,33 +30,30 @@ Ts</property>
             <property name="column_spacing">6</property>
             <child>
               <object class="GtkLabel" id="screen_reader_label">
-                <property name="visible">True</property>
-                <property name="can_focus">False</property>
-                <property name="hexpand">True</property>
+                <property name="hexpand">1</property>
                 <property name="xalign">0</property>
                 <property name="label" translatable="yes">The _Base</property>
-                <property name="use_underline">True</property>
+                <property name="use_underline">1</property>
                 <property name="mnemonic_widget">screen_reader_switch</property>
+                <layout>
+                  <property name="left_attach">0</property>
+                  <property name="top_attach">0</property>
+                  <property name="column-span">1</property>
+                  <property name="row-span">1</property>
+                </layout>
               </object>
-              <packing>
-                <property name="left_attach">0</property>
-                <property name="top_attach">0</property>
-                <property name="width">1</property>
-                <property name="height">1</property>
-              </packing>
             </child>
             <child>
               <object class="GtkSwitch" id="screen_reader_switch">
-                <property name="visible">True</property>
-                <property name="can_focus">True</property>
+                <property name="can_focus">1</property>
                 <property name="halign">end</property>
+                <layout>
+                  <property name="left_attach">1</property>
+                  <property name="top_attach">0</property>
+                  <property name="column-span">1</property>
+                  <property name="row-span">1</property>
+                </layout>
               </object>
-              <packing>
-                <property name="left_attach">1</property>
-                <property name="top_attach">0</property>
-                <property name="width">1</property>
-                <property name="height">1</property>
-              </packing>
             </child>
           </object>
         </child>

diff --git a/testsuite/reftests/window-height-for-width.ui b/testsuite/reftests/window-height-for-width.ui
index 4200e2e6edd44c97988936f3e4ab50038bfd2400..434c55bb78dcae01d4a3864e3e2e738d162274e7 100644 (file)
--- a/testsuite/reftests/window-height-for-width.ui
+++ b/testsuite/reftests/window-height-for-width.ui
@@ -1,34 +1,28 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
   <object class="GtkDialog" id="window1">
-    <property name="can_focus">False</property>
     <property name="title" translatable="yes">Dubstep</property>
     <property name="type_hint">dialog</property>
-    <property name="resizable">False</property>
-    <property name="modal">True</property>
+    <property name="resizable">0</property>
+    <property name="modal">1</property>
     <property name="use_header_bar">1</property>
     <child internal-child="content_area">
       <object class="GtkBox" id="dialog-vbox2">
-        <property name="can_focus">False</property>
         <property name="orientation">vertical</property>
         <property name="spacing">2</property>
         <child>
           <object class="GtkLabel" id="screen_reader_blurb">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="margin_start">12</property>
             <property name="margin_end">6</property>
             <property name="margin_top">6</property>
             <property name="xalign">0</property>
             <property name="max-width-chars">1</property>
             <property name="label" translatable="yes">WubWubWubWubWubWubWubWubWubWubWubWubWub Ts</property>
-            <property name="wrap">True</property>
+            <property name="wrap">1</property>
           </object>
         </child>
         <child>
           <object class="GtkGrid" id="grid3">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="margin_start">12</property>
             <property name="margin_end">6</property>
             <property name="margin_top">12</property>
@@ -37,33 +31,30 @@
             <property name="column_spacing">6</property>
             <child>
               <object class="GtkLabel" id="screen_reader_label">
-                <property name="visible">True</property>
-                <property name="can_focus">False</property>
-                <property name="hexpand">True</property>
+                <property name="hexpand">1</property>
                 <property name="xalign">0</property>
                 <property name="label" translatable="yes">The _Base</property>
-                <property name="use_underline">True</property>
+                <property name="use_underline">1</property>
                 <property name="mnemonic_widget">screen_reader_switch</property>
+                <layout>
+                  <property name="left_attach">0</property>
+                  <property name="top_attach">0</property>
+                  <property name="column-span">1</property>
+                  <property name="row-span">1</property>
+                </layout>
               </object>
-              <packing>
-                <property name="left_attach">0</property>
-                <property name="top_attach">0</property>
-                <property name="width">1</property>
-                <property name="height">1</property>
-              </packing>
             </child>
             <child>
               <object class="GtkSwitch" id="screen_reader_switch">
-                <property name="visible">True</property>
-                <property name="can_focus">True</property>
+                <property name="can_focus">1</property>
                 <property name="halign">end</property>
+                <layout>
+                  <property name="left_attach">1</property>
+                  <property name="top_attach">0</property>
+                  <property name="column-span">1</property>
+                  <property name="row-span">1</property>
+                </layout>
               </object>
-              <packing>
-                <property name="left_attach">1</property>
-                <property name="top_attach">0</property>
-                <property name="width">1</property>
-                <property name="height">1</property>
-              </packing>
             </child>
           </object>
         </child>

diff --git a/testsuite/reftests/window-show-contents-on-map.ref.ui b/testsuite/reftests/window-show-contents-on-map.ref.ui
index d96ec68e95d548fb77ab677b55b180edcc02df4d..897580cc484c578fa839f4d557ab219c0a03557d 100644 (file)
--- a/testsuite/reftests/window-show-contents-on-map.ref.ui
+++ b/testsuite/reftests/window-show-contents-on-map.ref.ui
@@ -1,18 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!-- Generated with glade 3.18.1 -->
 <interface>
   <requires lib="gtk+" version="3.12"/>
   <object class="GtkWindow" id="window1">
     <property name="width_request">200</property>
     <property name="height_request">200</property>
-    <property name="can_focus">False</property>
     <property name="type">popup</property>
     <child>
       <object class="GtkLabel" id="label1">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
         <property name="label" translatable="yes">This label is only shown when the window is mapped. So the window does its first size allocation without the label being visible and has to resize.</property>
-        <property name="wrap">True</property>
+        <property name="wrap">1</property>
         <property name="width_chars">20</property>
         <property name="max_width_chars">20</property>
       </object>

diff --git a/testsuite/reftests/window-show-contents-on-map.ui b/testsuite/reftests/window-show-contents-on-map.ui
index def0bf9ccf217a07802e38a23fc2ad871ab0e842..3285b5f05a46a1ec89807f2e91c4e68e0a5d9b42 100644 (file)
--- a/testsuite/reftests/window-show-contents-on-map.ui
+++ b/testsuite/reftests/window-show-contents-on-map.ui
@@ -1,17 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!-- Generated with glade 3.18.1 -->
 <interface>
   <requires lib="gtk+" version="3.12"/>
   <object class="GtkWindow" id="window1">
-    <property name="can_focus">False</property>
     <property name="type">popup</property>
     <signal name="map" handler="gtk_widget_show" object="label1" after="yes" swapped="yes"/>
     <child>
       <object class="GtkLabel" id="label1">
-        <property name="can_focus">False</property>
         <property name="label" translatable="yes">This label is only shown when the window is mapped. So the window does its first size allocation without the label being visible and has to resize.</property>
         <property name="width_chars">20</property>
-        <property name="wrap">True</property>
+        <property name="wrap">1</property>
       </object>
     </child>
   </object>